From 1de16913b70ae44a314ad3a53f86bc9a088bfe49 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 16 Aug 2022 18:38:35 +0000 Subject: [PATCH 001/102] [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 002/102] 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 003/102] 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 004/102] 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 005/102] 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 006/102] 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 007/102] 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 008/102] 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 009/102] 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 010/102] 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 69459735fbc1c6397d95c554c6af59e334f9541a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 31 Aug 2022 13:09:27 +0000 Subject: [PATCH 011/102] [internal/release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages --- NuGet.config | 6 ++++++ eng/Version.Details.xml | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 12bf3543c..6a32b7c94 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -18,9 +19,11 @@ + + @@ -39,14 +42,17 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34b38836f..86b8156c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 41323ecb0b2312980381bfdbb75afd2dae2b266b - + https://github.com/dotnet/source-build-reference-packages - fdbbfadcaa5804038ad0a3f67c33f489cbeda65c + e45e6e20c7c079c96f4dc8c35d6346ab9b2d745f From 956a61ea043939ddc703a562d63df492f1fcfee4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 1 Sep 2022 18:00:10 +0000 Subject: [PATCH 012/102] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220901.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.304-servicing.22451.9 --- NuGet.config | 6 ++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6a32b7c94..ad2f8ae6c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -19,10 +20,12 @@ + + @@ -43,16 +46,19 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86b8156c0..54b864de2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 092f7d6f55df8dd0e5e88058aeb7f831679112d3 + 9cff9ad9aa309210b0f98d50793b0d77d60db2a9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 092f7d6f55df8dd0e5e88058aeb7f831679112d3 + 9cff9ad9aa309210b0f98d50793b0d77d60db2a9 diff --git a/eng/Versions.props b/eng/Versions.props index 33a74cb2a..e0008f96d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.304-servicing.22421.4 - 6.0.304-servicing.22421.4 + 6.0.304-servicing.22451.9 + 6.0.304-servicing.22451.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 24a4bb58f05c131655604a5af3f146102df2a6f8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 6 Sep 2022 21:34:39 +0000 Subject: [PATCH 013/102] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220906.40 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22456.40 --- 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 54b864de2..3b89085e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9cff9ad9aa309210b0f98d50793b0d77d60db2a9 + d226374650a977614902a2ddea8e589deb32e44b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9cff9ad9aa309210b0f98d50793b0d77d60db2a9 + d226374650a977614902a2ddea8e589deb32e44b diff --git a/eng/Versions.props b/eng/Versions.props index e0008f96d..ad12381ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.304-servicing.22451.9 - 6.0.304-servicing.22451.9 + 6.0.305-servicing.22456.40 + 6.0.305-servicing.22456.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d10c9b78712fcf73b71a40f5056a4ccdc2d91a61 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 7 Sep 2022 08:49:12 +0000 Subject: [PATCH 014/102] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220907.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22457.5 --- 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 3b89085e4..ed786cda7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d226374650a977614902a2ddea8e589deb32e44b + 7f19abf7f493242f40ab396b90062021906fa006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d226374650a977614902a2ddea8e589deb32e44b + 7f19abf7f493242f40ab396b90062021906fa006 diff --git a/eng/Versions.props b/eng/Versions.props index ad12381ec..5151a7cf6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22456.40 - 6.0.305-servicing.22456.40 + 6.0.305-servicing.22457.5 + 6.0.305-servicing.22457.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7a7236272ebb20a6e7216078ac076319e5726c18 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 8 Sep 2022 22:07:13 +0000 Subject: [PATCH 015/102] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220908.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22458.13 --- 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 ed786cda7..b7c9003dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f19abf7f493242f40ab396b90062021906fa006 + 1c570494e29a40805eb76981495879001a9f888a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f19abf7f493242f40ab396b90062021906fa006 + 1c570494e29a40805eb76981495879001a9f888a diff --git a/eng/Versions.props b/eng/Versions.props index 5151a7cf6..2ead6c535 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22457.5 - 6.0.305-servicing.22457.5 + 6.0.305-servicing.22458.13 + 6.0.305-servicing.22458.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4ba209a45acc8e407d607a4a0a066df5c1584b6b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 13 Sep 2022 00:20:00 +0000 Subject: [PATCH 016/102] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220912.31 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22462.31 --- 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 b7c9003dd..1a66bf53d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c570494e29a40805eb76981495879001a9f888a + 4f67b114acf888f646ad8c9f58e0c14069d8daf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c570494e29a40805eb76981495879001a9f888a + 4f67b114acf888f646ad8c9f58e0c14069d8daf3 diff --git a/eng/Versions.props b/eng/Versions.props index 2ead6c535..aca8dc7f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22458.13 - 6.0.305-servicing.22458.13 + 6.0.305-servicing.22462.31 + 6.0.305-servicing.22462.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From be85081b6f4b8be50c991a650b9453597ff690eb Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 11 Aug 2022 16:41:17 -0700 Subject: [PATCH 017/102] use mktemp to correctly use temp files --- src/redist/targets/packaging/deb/postinst | 3 +-- src/redist/targets/packaging/osx/clisdk/scripts/postinstall | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/redist/targets/packaging/deb/postinst b/src/redist/targets/packaging/deb/postinst index 142daff4e..ff22bcbc1 100644 --- a/src/redist/targets/packaging/deb/postinst +++ b/src/redist/targets/packaging/deb/postinst @@ -22,6 +22,5 @@ first_run() { /usr/share/dotnet/dotnet exec /usr/share/dotnet/sdk/%SDK_VERSION%/dotnet.dll internal-reportinstallsuccess "debianpackage" > /dev/null 2>&1 || true } -INSTALL_TEMP_HOME=/tmp/dotnet-installer -[ -d $INSTALL_TEMP_HOME ] || mkdir $INSTALL_TEMP_HOME +INSTALL_TEMP_HOME=$(mktemp -d) # mktemp should set 700 perm automatically HOME=$INSTALL_TEMP_HOME first_run diff --git a/src/redist/targets/packaging/osx/clisdk/scripts/postinstall b/src/redist/targets/packaging/osx/clisdk/scripts/postinstall index 28339be99..86710223d 100644 --- a/src/redist/targets/packaging/osx/clisdk/scripts/postinstall +++ b/src/redist/targets/packaging/osx/clisdk/scripts/postinstall @@ -12,7 +12,7 @@ first_run() { $INSTALL_DESTINATION/dotnet exec $INSTALL_DESTINATION/sdk/%SDK_VERSION%/dotnet.dll internal-reportinstallsuccess "$1" > /dev/null 2>&1 || true } -[ -d $INSTALL_TEMP_HOME ] || mkdir $INSTALL_TEMP_HOME +INSTALL_TEMP_HOME=$(mktemp -d) # mktemp should set 700 perm automatically HOME=$INSTALL_TEMP_HOME first_run exit 0 From 73436261e3d6795b2c5dd8a23b46cb64e6b40284 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 13 Sep 2022 09:20:55 -0400 Subject: [PATCH 018/102] GetRuntimeInformation.targets: determine PortableProductMonikerRid based on OSName and Architecture. (backports #12516) --- src/redist/targets/GetRuntimeInformation.targets | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets index 5133c3a38..01f704c7d 100644 --- a/src/redist/targets/GetRuntimeInformation.targets +++ b/src/redist/targets/GetRuntimeInformation.targets @@ -28,6 +28,8 @@ '$(Rid)' == 'linux-musl-x64' ">$(Rid) $(OSName)-$(Architecture) + $(HostOSName)-$(Architecture) + dotnet-sdk-internal$(PgoTerm) dotnet-sdk$(PgoTerm) From 05ac09da1c2c439a594e9e8903619691b698efbd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 13 Sep 2022 23:54:36 +0000 Subject: [PATCH 019/102] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220913.34 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22463.34 --- NuGet.config | 2 -- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index ad2f8ae6c..ec93b2fb5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,6 @@ - @@ -50,7 +49,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a66bf53d..2a6ef293f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f67b114acf888f646ad8c9f58e0c14069d8daf3 + 0e4434b5bf3a705168fa40e9c5246e9382e5c623 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f67b114acf888f646ad8c9f58e0c14069d8daf3 + 0e4434b5bf3a705168fa40e9c5246e9382e5c623 diff --git a/eng/Versions.props b/eng/Versions.props index aca8dc7f6..e27cf69e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22462.31 - 6.0.305-servicing.22462.31 + 6.0.305-servicing.22463.34 + 6.0.305-servicing.22463.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b45ac4a743f7ff12a1a11e75e6dcb73c1926542f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Sep 2022 00:56:34 +0000 Subject: [PATCH 020/102] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220913.41 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22463.41 --- 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 2a6ef293f..6b62df2cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0e4434b5bf3a705168fa40e9c5246e9382e5c623 + 93fa53773217a253adce7ea28a794ba7920a5919 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0e4434b5bf3a705168fa40e9c5246e9382e5c623 + 93fa53773217a253adce7ea28a794ba7920a5919 diff --git a/eng/Versions.props b/eng/Versions.props index e27cf69e7..444ee8c72 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22463.34 - 6.0.305-servicing.22463.34 + 6.0.305-servicing.22463.41 + 6.0.305-servicing.22463.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 952fd4a43af24fff86fdced90561871c95459ac1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Sep 2022 16:08:36 +0000 Subject: [PATCH 021/102] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220914.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22464.21 Dependency coherency updates NuGet.Build.Tasks From Version 6.2.1-rc.7 -> To Version 6.2.2-rc.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ------------ eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index ec93b2fb5..71373bd88 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,14 +18,8 @@ - - - - - - @@ -50,14 +44,8 @@ - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b62df2cb..b1f270b6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93fa53773217a253adce7ea28a794ba7920a5919 + 2336f3adc98fface4160b2265684b302bf642fbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93fa53773217a253adce7ea28a794ba7920a5919 + 2336f3adc98fface4160b2265684b302bf642fbd @@ -151,9 +151,9 @@ 41abc5629965e3f9e41f1e67fdf78345c0c5cc4b - - https://github.com/nuget/nuget.client - 4be14ee6b6587a02f05337505bd840fbcbe898f6 + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 027ca8b8ef4b4dc94995f87b9c441d2bcf742c1d diff --git a/eng/Versions.props b/eng/Versions.props index 444ee8c72..a59824852 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22463.41 - 6.0.305-servicing.22463.41 + 6.0.305-servicing.22464.21 + 6.0.305-servicing.22464.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 62d0b8c97fcb18d33b37442131c8daf49a94961d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Sep 2022 19:03:04 +0000 Subject: [PATCH 022/102] Update dependencies from https://github.com/dotnet/arcade build 20220913.7 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 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/job/execute-sdl.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 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1f270b6c..1155b51b1 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 b5bc60221..29f8395ed 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/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 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 023/102] 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 5736f0f20f8af4b7e478cc94da161f4d261cd30a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 20 Sep 2022 15:12:44 +0000 Subject: [PATCH 024/102] Merged PR 25462: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220919.14 - **Date Produced**: September 19, 2022 7:24:58 PM UTC - **Commit**: 020b4fda1c3cf81307d8f13689d63bb3c09c91a8 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.109-servicing.22421.3 to 6.0.110-servicing.22469.14][23] - **Microsoft.NET.Sdk**: [from 6.0.109-servicing.22421.3 to 6.0.110-servicing.22469.14][23] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.9 to 6.0.10][24] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9][24] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9][24] - **Microsoft.NETCore.App.Ref**: [from 6.0.9 to 6.0.10][25] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22463.20][25] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][25] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.9 to 6.0.10][25] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.9 to 6.0.10][25] - **Microsoft.NETCore.Platforms**: [from 6.0.5 to 6.0.6][26] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.9 to 6.0.10][27] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][27] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27] - **dotnet-dev-certs**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27] - **dotnet-user-secrets**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.109 to 6.0.110][28] - **Microsoft.TemplateEngine.Cli**: [from 6.0.109-servicing.22420.11 to 6.0.110-servicing.22464.25][28] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.109 to 6.0.110][28] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][24] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][24] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.9-servicing.22420.4 to 6.0.10-servicing.22456.13][29] - **Microsoft.Build**: [from 17.0.0 to 17.0.1][30] - **NuGet.Build.Tasks**: [from 6.0.2-rc.5 to 6.0.3-rc.1][31] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22463.20][25] [23]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7fffe6d&targetVersion=GC020b4fd&_a=files [24]: https://dev.azure.com/dnceng/inte... --- NuGet.config | 23 ++-- eng/Version.Details.xml | 104 +++++++++--------- eng/Versions.props | 44 ++++---- ...ed-source-build-patches-and-re-patch.patch | 13 +-- 4 files changed, 93 insertions(+), 91 deletions(-) diff --git a/NuGet.config b/NuGet.config index 064b33cd4..c0cde394f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,22 @@ - + - + + - + - + - + @@ -42,15 +43,19 @@ - + + + + + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1590bda3d..9f9041c32 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 00ae92888ed9fec29636897b0dca996dc8c57356 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 00ae92888ed9fec29636897b0dca996dc8c57356 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 00ae92888ed9fec29636897b0dca996dc8c57356 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 00ae92888ed9fec29636897b0dca996dc8c57356 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 00ae92888ed9fec29636897b0dca996dc8c57356 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 00ae92888ed9fec29636897b0dca996dc8c57356 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 00ae92888ed9fec29636897b0dca996dc8c57356 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2410d6496db6fd9153ffac85eedfd80f57390999 + 91c300fc9d5214eff6830ea3ec3c83930aea7236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2410d6496db6fd9153ffac85eedfd80f57390999 + 91c300fc9d5214eff6830ea3ec3c83930aea7236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2410d6496db6fd9153ffac85eedfd80f57390999 + 91c300fc9d5214eff6830ea3ec3c83930aea7236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7fffe6d57cecdb3a726b915334d1add560bd6134 + 020b4fda1c3cf81307d8f13689d63bb3c09c91a8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7fffe6d57cecdb3a726b915334d1add560bd6134 + 020b4fda1c3cf81307d8f13689d63bb3c09c91a8 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a97bb2af3c7d400dfe8aca3fa3d47ba83d925d6c + ee8dec2e3ed2d73d8f7b7bea5662c2222d1fd182 https://github.com/dotnet/fsharp @@ -146,14 +146,14 @@ 487283bcd8d66693091f2800dcf1c8ae37cccdee - - https://github.com/dotnet/msbuild - c9eb9dd64e9a2e8a433900a1a626d65a2bce4428 + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + b177f8fa703370c80b2e56469208c2bb099efba0 - - https://github.com/nuget/nuget.client - 75551652b352f860ea0b29095b64fa63715dd672 + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + c60eee85ec0109bdda894806b167bb4d55f75183 diff --git a/eng/Versions.props b/eng/Versions.props index c083f75ae..1fa06c07a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,11 +27,11 @@ - 6.0.9-servicing.22420.4 + 6.0.10-servicing.22456.13 - 6.0.109 + 6.0.110 @@ -44,44 +44,44 @@ - 6.0.9 - 6.0.9 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 + 6.0.10 + 6.0.10 + 6.0.10-servicing.22464.7 + 6.0.10-servicing.22464.7 + 6.0.10-servicing.22464.7 + 6.0.10-servicing.22464.7 0.2.0 - 6.0.109-servicing.22421.3 - 6.0.109-servicing.22421.3 + 6.0.110-servicing.22469.14 + 6.0.110-servicing.22469.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.5 + 6.0.6 - 6.0.9-servicing.22419.5 - 6.0.9-servicing.22419.5 - 6.0.9 - 6.0.9 - 6.0.9 - 6.0.9 + 6.0.10-servicing.22463.20 + 6.0.10-servicing.22463.20 + 6.0.10 + 6.0.10 + 6.0.10 + 6.0.10 2.1.0 - 6.0.9-servicing.22420.3 - 6.0.9-servicing.22420.3 - 6.0.9 - 6.0.9 + 6.0.10-servicing.22464.9 + 6.0.10-servicing.22464.9 + 6.0.10 + 6.0.10 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.109 + 6.0.110 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch index 34d37ba0b..e1497020f 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch @@ -1,4 +1,4 @@ -From 157de59d479f2ed179b9b777eaf2b769871e3bf6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Sat, 23 Oct 2021 16:41:24 -0700 Subject: [PATCH] Remove uneeded source build patches and re-patch @@ -22,7 +22,7 @@ Subject: [PATCH] Remove uneeded source build patches and re-patch 15 files changed, 25 insertions(+), 28 deletions(-) diff --git a/build/common.project.props b/build/common.project.props -index 79a935391..65e482b83 100644 +index 47b5a6b60..50c40bac5 100644 --- a/build/common.project.props +++ b/build/common.project.props @@ -10,24 +10,20 @@ @@ -57,7 +57,7 @@ index 79a935391..65e482b83 100644 $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\ $(RepositoryRootDirectory)build\ diff --git a/build/packages.targets b/build/packages.targets -index c11557248..0e7dd7861 100644 +index d9b3006e9..99cb24a16 100644 --- a/build/packages.targets +++ b/build/packages.targets @@ -10,6 +10,7 @@ @@ -68,8 +68,8 @@ index c11557248..0e7dd7861 100644 -@@ -33,7 +34,7 @@ - +@@ -34,7 +35,7 @@ + - @@ -291,6 +291,3 @@ index 180293944..8498664b9 100644 NuGet's implementation of Semantic Versioning. semver;semantic versioning --- -2.31.1 - From ba3be673e17014b831f7f059c6f872fc5e9b62a8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 20 Sep 2022 15:57:48 +0000 Subject: [PATCH 025/102] Merged PR 25512: [internal/release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages This pull request updates the following dependencies [marker]: <> (Begin:4fe19a4b-6691-493a-bfdf-08da32c0fb1e) ## From https://github.com/dotnet/source-build-reference-packages - **Subscription**: 4fe19a4b-6691-493a-bfdf-08da32c0fb1e - **Build**: 20220914.1 - **Date Produced**: September 14, 2022 8:48:10 PM UTC - **Commit**: 59e601c150793f6a32cd39e598ba6fe94edfe21d - **Branch**: refs/heads/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 6.0.0-servicing.22426.1 to 6.0.0-servicing.22464.1][5] [5]: https://github.com/dotnet/source-build-reference-packages/compare/e45e6e2...59e601c [DependencyUpdate]: <> (End) [marker]: <> (End:4fe19a4b-6691-493a-bfdf-08da32c0fb1e) --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2aebca1c2..d0db176cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 2fbe602d12256bf82de53791ddcbb964c1541b4e - + https://github.com/dotnet/source-build-reference-packages - e45e6e20c7c079c96f4dc8c35d6346ab9b2d745f + 59e601c150793f6a32cd39e598ba6fe94edfe21d From 235e79474031bc4e9bfa3a52ff6d4eefbe552e73 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 20 Sep 2022 15:58:42 +0000 Subject: [PATCH 026/102] Merged PR 25952: [internal/release/6.0.4xx] 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 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.9-servicing.22420.4 to 6.0.10-servicing.22456.13 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.FSharp.Compiler**: from 12.0.4-beta.22410.1 to 12.0.4-beta.22469.1 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.fsharp**: from 6.0.6-beta.22410.1 to 6.0.6-beta.22469.1 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Test.Sdk**: from 17.3.0 to 17.3.1 (parent: Microsoft.NET.Sdk) - **Microsoft.Net.Compilers.Toolset**: from 4.3.0-3.22415.1 to 4.3.0-3.22465.2 (parent: Microsoft.NET.Sdk) - **Microsoft.Build**: from 17.3.1 to 17.3.2 (parent: Microsoft.NET.Sdk) - **NuGet.Build.Tasks**: from 6.3.0-rc.128 to 6.3.1-rc.1 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20220919.15 - **Date Produced**: September 19, 2022 7:26:07 PM UTC - **Commit**: c3e567c3e17db9915a5b301c3e982bebc26c8459 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.401-servicing.22421.5 to 6.0.402-servicing.22469.15][1] - **Microsoft.NET.Sdk**: [from 6.0.401-servicing.22421.5 to 6.0.402-servicing.22469.15][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.9 to 6.0.10][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][2] - **Microsoft.WindowsDesk... --- NuGet.config | 14 ++++++----- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------ 3 files changed, 44 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 71373bd88..6acd09ccf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,19 +7,19 @@ - - - + + + @@ -37,15 +37,17 @@ + + + + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b8705345..e986abf93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,36 +103,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 4ac7f473472dd810f75a183a760c16990c78fe34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18485c488a5469beb10ad61263885275f2d3b170 + cf925f705c9a47e0d45bdb7f97445bfaf8dedbd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18485c488a5469beb10ad61263885275f2d3b170 + cf925f705c9a47e0d45bdb7f97445bfaf8dedbd8 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a97bb2af3c7d400dfe8aca3fa3d47ba83d925d6c + ee8dec2e3ed2d73d8f7b7bea5662c2222d1fd182 - + https://github.com/dotnet/fsharp - d5218142e9d56ab25bb5d0034a77484be4dd7c17 + 4438112ed8e103d9af4fb0fd8d593a4e7f6777d2 - + https://github.com/dotnet/fsharp - d5218142e9d56ab25bb5d0034a77484be4dd7c17 + 4438112ed8e103d9af4fb0fd8d593a4e7f6777d2 - + https://github.com/microsoft/vstest - c7ba2ca721808f830482ace6be06ae93077e0e7b + 83d2f8162d29a66a8ff323c4bba93c8250013511 @@ -141,19 +141,19 @@ linker - + https://github.com/dotnet/roslyn - 8301d4840fa1a3e822c2cb17fdf7056fa6b41583 + 7d8de40e2bfe5bd2546ca49177166741af4c8e07 - - https://github.com/dotnet/msbuild - 2badb37d109910fbd3155cf8743224b7a27494d8 + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + 561848881bab01749e6d8b03be2869a18ca944f7 - - https://github.com/nuget/nuget.client - 222ff7a5329be15520034b76fa1a84098d2ae9fd + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 01bc4df1ef99c9c213f892ec8b25e46b23c7cfb1 diff --git a/eng/Versions.props b/eng/Versions.props index eb64e689f..53dfce5c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 6.0.9-servicing.22420.4 + 6.0.10-servicing.22456.13 @@ -56,8 +56,8 @@ - 6.0.401-servicing.22421.5 - 6.0.401-servicing.22421.5 + 6.0.402-servicing.22469.37 + 6.0.402-servicing.22469.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.9-servicing.22420.3 - 6.0.9-servicing.22420.3 - 6.0.9 - 6.0.9 + 6.0.10-servicing.22464.9 + 6.0.10-servicing.22464.9 + 6.0.10 + 6.0.10 @@ -152,7 +152,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.3.0 + 17.3.1 From ef06dab37f96319e1b09a6828945b6efea8f843b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 20 Sep 2022 18:04:39 +0000 Subject: [PATCH 027/102] Merged PR 25953: [internal/release/6.0.3xx] 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.Build**: from 17.2.0 to 17.2.2 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220919.16 - **Date Produced**: September 19, 2022 7:26:24 PM UTC - **Commit**: edd49c1bacac9342e15445a777722858e7f5fddf - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.305-servicing.22464.21 to 6.0.305-servicing.22469.16][1] - **Microsoft.NET.Sdk**: [from 6.0.305-servicing.22464.21 to 6.0.305-servicing.22469.16][1] - **Microsoft.Build**: [from 17.2.0 to 17.2.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC2336f3a&targetVersion=GCedd49c1&_a=files [2]: https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted/branches?baseVersion=GC41abc56&targetVersion=GC038f9ba&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 12 ++++++------ eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 71373bd88..36197c18e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,13 +7,12 @@ - - - + + @@ -37,10 +36,11 @@ + + + + - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d0db176cc..5128fedf6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2336f3adc98fface4160b2265684b302bf642fbd + edd49c1bacac9342e15445a777722858e7f5fddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2336f3adc98fface4160b2265684b302bf642fbd + edd49c1bacac9342e15445a777722858e7f5fddf @@ -146,9 +146,9 @@ 432d17a83aa5623e4581756f4d642997048056bd - - https://github.com/dotnet/msbuild - 41abc5629965e3f9e41f1e67fdf78345c0c5cc4b + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + 038f9bae9b34d1cca653360a46c5ce1eba4c2ac8 diff --git a/eng/Versions.props b/eng/Versions.props index 29f8395ed..58f127efe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22464.21 - 6.0.305-servicing.22464.21 + 6.0.305-servicing.22469.16 + 6.0.305-servicing.22469.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a3037401514f1f6652671a33dae3b3f5bbcc7df1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 20 Sep 2022 19:22:31 +0000 Subject: [PATCH 028/102] Merged PR 26000: [internal/release/6.0.4xx] 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.401 to 6.0.402 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.401-rtm.22420.12 to 6.0.402-rtm.22469.18 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.401 to 6.0.402 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20220920.13 - **Date Produced**: September 20, 2022 3:54:18 PM UTC - **Commit**: 104cf6c83a671272ac7ab8b7d8792025de764576 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.402-servicing.22469.37 to 6.0.402-servicing.22470.13][1] - **Microsoft.NET.Sdk**: [from 6.0.402-servicing.22469.37 to 6.0.402-servicing.22470.13][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.401 to 6.0.402][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.401-rtm.22420.12 to 6.0.402-rtm.22469.18][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.401 to 6.0.402][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCcf925f7&targetVersion=GC104cf6c&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC4ac7f47&targetVersion=GC4bd73a1&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 2 ++ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6acd09ccf..ae933ee91 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,6 +17,7 @@ + @@ -45,6 +46,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e986abf93..89c1a493d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4ac7f473472dd810f75a183a760c16990c78fe34 + 4bd73a1feb13cc38d4698045e2fa9bec7aff21ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4ac7f473472dd810f75a183a760c16990c78fe34 + 4bd73a1feb13cc38d4698045e2fa9bec7aff21ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4ac7f473472dd810f75a183a760c16990c78fe34 + 4bd73a1feb13cc38d4698045e2fa9bec7aff21ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cf925f705c9a47e0d45bdb7f97445bfaf8dedbd8 + 104cf6c83a671272ac7ab8b7d8792025de764576 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cf925f705c9a47e0d45bdb7f97445bfaf8dedbd8 + 104cf6c83a671272ac7ab8b7d8792025de764576 diff --git a/eng/Versions.props b/eng/Versions.props index 53dfce5c2..da4fa4576 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.401 + 6.0.402 @@ -56,8 +56,8 @@ - 6.0.402-servicing.22469.37 - 6.0.402-servicing.22469.37 + 6.0.402-servicing.22470.13 + 6.0.402-servicing.22470.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.401 + 6.0.402 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 1e97ca8042e6c35aa6a4365e8ee92eaadc846d4d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 20 Sep 2022 22:44:00 +0000 Subject: [PATCH 029/102] Merged PR 26033: [internal/release/6.0.3xx] 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 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22469.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22469.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.304 to 6.0.305 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.304-servicing.22420.10 to 6.0.305-servicing.22470.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.304 to 6.0.305 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.9-servicing.22419.10 to 6.0.10-servicing.22470.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win... --- NuGet.config | 8 ++++ eng/Version.Details.xml | 96 ++++++++++++++++++++--------------------- eng/Versions.props | 46 ++++++++++---------- 3 files changed, 79 insertions(+), 71 deletions(-) diff --git a/NuGet.config b/NuGet.config index 36197c18e..e0141f88e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -15,10 +16,13 @@ + + + @@ -41,11 +45,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5128fedf6..c9216ca47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0b3a1bf29b9888fb2ae25df25be9f5231606c66f + a596312f285b849740c070b3b9f0825dc0ba84cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0b3a1bf29b9888fb2ae25df25be9f5231606c66f + a596312f285b849740c070b3b9f0825dc0ba84cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0b3a1bf29b9888fb2ae25df25be9f5231606c66f + a596312f285b849740c070b3b9f0825dc0ba84cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - edd49c1bacac9342e15445a777722858e7f5fddf + fea45187a3648a964eb48f1c3cbbac1f59ae8a85 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - edd49c1bacac9342e15445a777722858e7f5fddf + fea45187a3648a964eb48f1c3cbbac1f59ae8a85 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c + 24d64ba63551a0f0457d62b834d043292d090815 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a97bb2af3c7d400dfe8aca3fa3d47ba83d925d6c + bbe6a9e6d0da0f80a57f80914177691fd1f1b97e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 58f127efe..4c2e4948f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.9-servicing.22419.10 + 6.0.10-servicing.22470.3 - 6.0.9-servicing.22420.4 + 6.0.10-servicing.22470.7 - 6.0.304 + 6.0.305 @@ -44,44 +44,44 @@ - 6.0.9 - 6.0.9 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 + 6.0.10 + 6.0.10 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 0.2.0 - 6.0.305-servicing.22469.16 - 6.0.305-servicing.22469.16 + 6.0.305-servicing.22470.36 + 6.0.305-servicing.22470.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.5 + 6.0.6 - 6.0.9-servicing.22419.5 - 6.0.9-servicing.22419.5 - 6.0.9 - 6.0.9 - 6.0.9 - 6.0.9 + 6.0.10-servicing.22469.10 + 6.0.10-servicing.22469.10 + 6.0.10 + 6.0.10 + 6.0.10 + 6.0.10 2.1.0 - 6.0.9-servicing.22420.3 - 6.0.9-servicing.22420.3 - 6.0.9 - 6.0.9 + 6.0.10-servicing.22470.9 + 6.0.10-servicing.22470.9 + 6.0.10 + 6.0.10 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.304 + 6.0.305 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From db430494a1e10a40e504d0ab10001bd0ac046bb5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 20 Sep 2022 23:16:41 +0000 Subject: [PATCH 030/102] Merged PR 26041: [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.WindowsDesktop.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22464.9 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22464.9 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22463.20 to 6.0.10-servicing.22469.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.110-servicing.22464.25 to 6.0.110-servicing.22470.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.9-servicing.22419.10 to 6.0.10-servicing.22470.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22456... --- NuGet.config | 17 ++++----- eng/Version.Details.xml | 78 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 3 files changed, 61 insertions(+), 60 deletions(-) diff --git a/NuGet.config b/NuGet.config index c0cde394f..811cea214 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,23 @@ - + + - + - + - + @@ -43,19 +44,19 @@ + - - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f9041c32..e680f6eaa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 00ae92888ed9fec29636897b0dca996dc8c57356 + 3bd501a063af406167e0195844048a3c222afd29 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 00ae92888ed9fec29636897b0dca996dc8c57356 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 00ae92888ed9fec29636897b0dca996dc8c57356 + 3bd501a063af406167e0195844048a3c222afd29 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 00ae92888ed9fec29636897b0dca996dc8c57356 + 3bd501a063af406167e0195844048a3c222afd29 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 00ae92888ed9fec29636897b0dca996dc8c57356 + 3bd501a063af406167e0195844048a3c222afd29 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 00ae92888ed9fec29636897b0dca996dc8c57356 + 3bd501a063af406167e0195844048a3c222afd29 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 00ae92888ed9fec29636897b0dca996dc8c57356 + 3bd501a063af406167e0195844048a3c222afd29 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 91c300fc9d5214eff6830ea3ec3c83930aea7236 + e974c52ac3a074586f4be165c1ba00618dca95dc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 91c300fc9d5214eff6830ea3ec3c83930aea7236 + e974c52ac3a074586f4be165c1ba00618dca95dc https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 91c300fc9d5214eff6830ea3ec3c83930aea7236 + e974c52ac3a074586f4be165c1ba00618dca95dc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 020b4fda1c3cf81307d8f13689d63bb3c09c91a8 + aa67ae078f3df70e5b3d6b77b07af9f77ebc2e13 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 020b4fda1c3cf81307d8f13689d63bb3c09c91a8 + aa67ae078f3df70e5b3d6b77b07af9f77ebc2e13 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c + 24d64ba63551a0f0457d62b834d043292d090815 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - ee8dec2e3ed2d73d8f7b7bea5662c2222d1fd182 + bbe6a9e6d0da0f80a57f80914177691fd1f1b97e https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 3f6c45a2580cd9387b643163de8136a9691764c8 + c3fc739ca5a38641fe021f94c3986465296c71e0 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 1fa06c07a..42e7f9fe4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.9-servicing.22419.10 + 6.0.10-servicing.22470.3 - 6.0.10-servicing.22456.13 + 6.0.10-servicing.22470.7 @@ -46,18 +46,18 @@ 6.0.10 6.0.10 - 6.0.10-servicing.22464.7 - 6.0.10-servicing.22464.7 - 6.0.10-servicing.22464.7 - 6.0.10-servicing.22464.7 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 0.2.0 - 6.0.110-servicing.22469.14 - 6.0.110-servicing.22469.14 + 6.0.110-servicing.22470.38 + 6.0.110-servicing.22470.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.10-servicing.22463.20 - 6.0.10-servicing.22463.20 + 6.0.10-servicing.22469.10 + 6.0.10-servicing.22469.10 6.0.10 6.0.10 6.0.10 @@ -78,8 +78,8 @@ - 6.0.10-servicing.22464.9 - 6.0.10-servicing.22464.9 + 6.0.10-servicing.22470.9 + 6.0.10-servicing.22470.9 6.0.10 6.0.10 @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.9 + 6.0.10 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From c74f58b3e055436a7425711b181750b942d0ffaa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 20 Sep 2022 23:18:29 +0000 Subject: [PATCH 031/102] Merged PR 26035: [internal/release/6.0.4xx] 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 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22464.9 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22464.9 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22469.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22469.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.402 to 6.0.402 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.402-rtm.22469.18 to 6.0.402-rtm.22470.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.402 to 6.0.402 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.9-servicing.22419.10 to 6.0.10-servicing.22470.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: ... --- NuGet.config | 12 ++++-- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 38 +++++++++--------- 3 files changed, 71 insertions(+), 67 deletions(-) diff --git a/NuGet.config b/NuGet.config index ae933ee91..6ef2f2d6e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -15,12 +16,13 @@ + - + - + @@ -43,13 +45,15 @@ + + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89c1a493d..a4720d6aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4bd73a1feb13cc38d4698045e2fa9bec7aff21ac + d8feef05ebeec0092dc708b8f8d20d1c485cf475 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4bd73a1feb13cc38d4698045e2fa9bec7aff21ac + d8feef05ebeec0092dc708b8f8d20d1c485cf475 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4bd73a1feb13cc38d4698045e2fa9bec7aff21ac + d8feef05ebeec0092dc708b8f8d20d1c485cf475 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 104cf6c83a671272ac7ab8b7d8792025de764576 + c252faf34d6083db553f573027bc49423c6eb59d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 104cf6c83a671272ac7ab8b7d8792025de764576 + c252faf34d6083db553f573027bc49423c6eb59d - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c + 24d64ba63551a0f0457d62b834d043292d090815 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - ee8dec2e3ed2d73d8f7b7bea5662c2222d1fd182 + bbe6a9e6d0da0f80a57f80914177691fd1f1b97e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index da4fa4576..35666876f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.9-servicing.22419.10 + 6.0.10-servicing.22470.3 - 6.0.10-servicing.22456.13 + 6.0.10-servicing.22470.7 @@ -44,42 +44,42 @@ - 6.0.9 - 6.0.9 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 + 6.0.10 + 6.0.10 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 0.2.0 - 6.0.402-servicing.22470.13 - 6.0.402-servicing.22470.13 + 6.0.402-servicing.22470.37 + 6.0.402-servicing.22470.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.5 + 6.0.6 - 6.0.9-servicing.22419.5 - 6.0.9-servicing.22419.5 - 6.0.9 - 6.0.9 - 6.0.9 - 6.0.9 + 6.0.10-servicing.22469.10 + 6.0.10-servicing.22469.10 + 6.0.10 + 6.0.10 + 6.0.10 + 6.0.10 2.1.0 - 6.0.10-servicing.22464.9 - 6.0.10-servicing.22464.9 + 6.0.10-servicing.22470.9 + 6.0.10-servicing.22470.9 6.0.10 6.0.10 From 8aec008f2ecfecc775ddec389f863a39d37c3e4f Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Wed, 21 Sep 2022 21:54:18 -0700 Subject: [PATCH 032/102] 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 ac35c5ce79798a350a5d175ce50ce873e72d8b79 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 27 Sep 2022 01:07:17 +0000 Subject: [PATCH 033/102] Merged PR 26213: [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.NETCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.110-servicing.22470.2 to 6.0.110-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (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**: 20220926.22 - **Date Produced**: September 26, 2022 11:14:22 PM UTC - **Commit**: 4041520e714b4334789706bde25e61ff91cf6c2b - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.110-servicing.22470.38 to 6.0.110-servicing.22476.22][1] - **Microsoft.NET.Sdk**: [from 6.0.110-servicing.22470.38 to 6.0.110-servicing.22476.22][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.Platforms**: [from 6.0.6 to 6.0.6][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.110 to 6.0.110][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.110-servicing.22470.2 to 6.0.110-servicing.22476.12][3] - **Microsoft.DotNet.Common.ProjectTemplates.6.0*... --- NuGet.config | 26 ++++++++++++++++++++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 8 ++++---- 3 files changed, 43 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index 811cea214..ea43ed595 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,22 +8,32 @@ + + + + + + + + - + - + + + @@ -44,18 +54,26 @@ + + + + + + - + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e680f6eaa..7081c5123 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e974c52ac3a074586f4be165c1ba00618dca95dc + 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e974c52ac3a074586f4be165c1ba00618dca95dc + 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e974c52ac3a074586f4be165c1ba00618dca95dc + 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aa67ae078f3df70e5b3d6b77b07af9f77ebc2e13 + 4041520e714b4334789706bde25e61ff91cf6c2b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aa67ae078f3df70e5b3d6b77b07af9f77ebc2e13 + 4041520e714b4334789706bde25e61ff91cf6c2b diff --git a/eng/Versions.props b/eng/Versions.props index 42e7f9fe4..e00ae53b9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.110-servicing.22470.38 - 6.0.110-servicing.22470.38 + 6.0.110-servicing.22476.22 + 6.0.110-servicing.22476.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.10-servicing.22469.10 - 6.0.10-servicing.22469.10 + 6.0.10-servicing.22476.5 + 6.0.10-servicing.22476.5 6.0.10 6.0.10 6.0.10 From a7f3165e1276bbb1b8154e1a587fd81246105545 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 27 Sep 2022 01:07:35 +0000 Subject: [PATCH 034/102] Merged PR 26214: [internal/release/6.0.3xx] 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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.305 to 6.0.305 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.305-servicing.22470.3 to 6.0.305-servicing.22476.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.305 to 6.0.305 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220926.23 - **Date Produced**: September 26, 2022 11:16:43 PM UTC - **Commit**: 5d8812a013856b4d818578302844a7add0f675f9 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.305-servicing.22470.36 to 6.0.305-servicing.22476.23][1] - **Microsoft.NET.Sdk**: [from 6.0.305-servicing.22470.36 to 6.0.305-servicing.22476.23][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.Platforms**: [from 6.0.6 to 6.0.6][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.305 to 6.0.305][3] - **Microsoft.TemplateEngine.Cl... --- NuGet.config | 24 ++++++++++++++++++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 8 ++++---- 3 files changed, 41 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index e0141f88e..19736d26e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,29 @@ + + + + + + - + - + + + @@ -42,17 +50,25 @@ + + + + + + - + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9216ca47..b2d2a53f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a596312f285b849740c070b3b9f0825dc0ba84cf + 13826b7b41995f89808a7b7644b41a89f81b33b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a596312f285b849740c070b3b9f0825dc0ba84cf + 13826b7b41995f89808a7b7644b41a89f81b33b6 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a596312f285b849740c070b3b9f0825dc0ba84cf + 13826b7b41995f89808a7b7644b41a89f81b33b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fea45187a3648a964eb48f1c3cbbac1f59ae8a85 + 5d8812a013856b4d818578302844a7add0f675f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fea45187a3648a964eb48f1c3cbbac1f59ae8a85 + 5d8812a013856b4d818578302844a7add0f675f9 diff --git a/eng/Versions.props b/eng/Versions.props index 4c2e4948f..f3390961a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22470.36 - 6.0.305-servicing.22470.36 + 6.0.305-servicing.22476.23 + 6.0.305-servicing.22476.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.10-servicing.22469.10 - 6.0.10-servicing.22469.10 + 6.0.10-servicing.22476.5 + 6.0.10-servicing.22476.5 6.0.10 6.0.10 6.0.10 From 9b4f4ba2f2ef3a1427d41f490146b1a51e1da247 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 27 Sep 2022 01:08:12 +0000 Subject: [PATCH 035/102] Merged PR 26215: [internal/release/6.0.4xx] 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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.402 to 6.0.402 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.402-rtm.22470.4 to 6.0.402-rtm.22476.14 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.402 to 6.0.402 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20220926.24 - **Date Produced**: September 26, 2022 11:17:08 PM UTC - **Commit**: da945c96e1700122a8b0847662dbfc4cede39cd6 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.402-servicing.22470.37 to 6.0.402-servicing.22476.24][1] - **Microsoft.NET.Sdk**: [from 6.0.402-servicing.22470.37 to 6.0.402-servicing.22476.24][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.Platforms**: [from 6.0.6 to 6.0.6][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.402 to 6.0.402][3] - **Microsoft.TemplateEngine.Cli**: [from 6... --- NuGet.config | 24 ++++++++++++++++++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 8 ++++---- 3 files changed, 41 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6ef2f2d6e..48041fd8b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,29 @@ + + + + + + - + - + + + @@ -42,17 +50,25 @@ + + + + + + - + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4720d6aa..b2a449246 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d8feef05ebeec0092dc708b8f8d20d1c485cf475 + 759d4664e22f40aba187b41a7eae8c5e8b40787c - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d8feef05ebeec0092dc708b8f8d20d1c485cf475 + 759d4664e22f40aba187b41a7eae8c5e8b40787c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d8feef05ebeec0092dc708b8f8d20d1c485cf475 + 759d4664e22f40aba187b41a7eae8c5e8b40787c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c252faf34d6083db553f573027bc49423c6eb59d + da945c96e1700122a8b0847662dbfc4cede39cd6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c252faf34d6083db553f573027bc49423c6eb59d + da945c96e1700122a8b0847662dbfc4cede39cd6 diff --git a/eng/Versions.props b/eng/Versions.props index 35666876f..0cfb3da79 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.402-servicing.22470.37 - 6.0.402-servicing.22470.37 + 6.0.402-servicing.22476.24 + 6.0.402-servicing.22476.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.10-servicing.22469.10 - 6.0.10-servicing.22469.10 + 6.0.10-servicing.22476.5 + 6.0.10-servicing.22476.5 6.0.10 6.0.10 6.0.10 From 7160f0679472c0a7dda71a1a129419db5418aba5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 27 Sep 2022 02:11:30 +0000 Subject: [PATCH 036/102] Merged PR 26229: [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.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.110-servicing.22476.12 to 6.0.110-servicing.22476.19 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.110 to 6.0.110 (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**: 20220926.31 - **Date Produced**: September 27, 2022 1:37:52 AM UTC - **Commit**: cb11e73629ffbf6eee418a40fc602ceb752794fa - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.110-servicing.22476.22 to 6.0.110-servicing.22476.31][1] - **Microsoft.NET.Sdk**: [from 6.0.110-servicing.22476.22 to 6.0.110-servicing.22476.31][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.10 to 6.0.10][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **dotnet-dev-certs**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **dotnet-user-secrets**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.110 to 6.0.110][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.110-servicing.22476.12 to 6.0.110-servicing.2247... --- NuGet.config | 12 ++++-------- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index ea43ed595..f723aa707 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -28,7 +26,7 @@ - + @@ -54,9 +52,7 @@ - - - + @@ -69,7 +65,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7081c5123..6e95ba73e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 + abad6c0ec8f1f7f65a233956f4d02bbfd3cd0c27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 + abad6c0ec8f1f7f65a233956f4d02bbfd3cd0c27 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 + abad6c0ec8f1f7f65a233956f4d02bbfd3cd0c27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4041520e714b4334789706bde25e61ff91cf6c2b + cb11e73629ffbf6eee418a40fc602ceb752794fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4041520e714b4334789706bde25e61ff91cf6c2b + cb11e73629ffbf6eee418a40fc602ceb752794fa diff --git a/eng/Versions.props b/eng/Versions.props index e00ae53b9..f632ef8fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.10 6.0.10 - 6.0.10-servicing.22469.29 - 6.0.10-servicing.22469.29 - 6.0.10-servicing.22469.29 - 6.0.10-servicing.22469.29 + 6.0.10-servicing.22476.12 + 6.0.10-servicing.22476.12 + 6.0.10-servicing.22476.12 + 6.0.10-servicing.22476.12 0.2.0 - 6.0.110-servicing.22476.22 - 6.0.110-servicing.22476.22 + 6.0.110-servicing.22476.31 + 6.0.110-servicing.22476.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ee01434eb368e7c21e0d8cfdf5fc7149ddc886e3 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 27 Sep 2022 02:11:34 +0000 Subject: [PATCH 037/102] Merged PR 26230: [internal/release/6.0.3xx] 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.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.305 to 6.0.305 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.305-servicing.22476.13 to 6.0.305-servicing.22476.20 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.305 to 6.0.305 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220926.32 - **Date Produced**: September 27, 2022 1:41:11 AM UTC - **Commit**: 5fd3362390628630252507a10e451f4877afe1c2 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.305-servicing.22476.23 to 6.0.305-servicing.22476.32][1] - **Microsoft.NET.Sdk**: [from 6.0.305-servicing.22476.23 to 6.0.305-servicing.22476.32][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.10 to 6.0.10][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **dotnet-dev-certs**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **dotnet-user-secrets**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.305 to 6.0.305][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.305-servicing.22476.13 to 6.0.305-servicing.2247... --- NuGet.config | 12 ++++-------- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 19736d26e..6ad4589ff 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -25,7 +23,7 @@ - + @@ -57,14 +55,12 @@ - - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2d2a53f7..313ce9492 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 13826b7b41995f89808a7b7644b41a89f81b33b6 + 4c6436d0fb4378537a091f06432b306ea8ef383e - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 13826b7b41995f89808a7b7644b41a89f81b33b6 + 4c6436d0fb4378537a091f06432b306ea8ef383e https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 13826b7b41995f89808a7b7644b41a89f81b33b6 + 4c6436d0fb4378537a091f06432b306ea8ef383e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5d8812a013856b4d818578302844a7add0f675f9 + 5fd3362390628630252507a10e451f4877afe1c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5d8812a013856b4d818578302844a7add0f675f9 + 5fd3362390628630252507a10e451f4877afe1c2 diff --git a/eng/Versions.props b/eng/Versions.props index f3390961a..0b89a0a15 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.10 6.0.10 - 6.0.10-servicing.22469.29 - 6.0.10-servicing.22469.29 - 6.0.10-servicing.22469.29 - 6.0.10-servicing.22469.29 + 6.0.10-servicing.22476.12 + 6.0.10-servicing.22476.12 + 6.0.10-servicing.22476.12 + 6.0.10-servicing.22476.12 0.2.0 - 6.0.305-servicing.22476.23 - 6.0.305-servicing.22476.23 + 6.0.305-servicing.22476.32 + 6.0.305-servicing.22476.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ce0a42998a3d2a725f5bd08413b140d907f48177 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 27 Sep 2022 04:17:12 +0000 Subject: [PATCH 038/102] Merged PR 26243: [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.WindowsDesktop.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.10-servicing.22470.3 to 6.0.10-servicing.22476.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22470.7 to 6.0.10-servicing.22476.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [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**: 20220926.46 - **Date Produced**: September 27, 2022 3:39:36 AM UTC - **Commit**: a886cd6214c92f6a5d955c056014820c35591e7b - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.110-servicing.22476.31 to 6.0.110-servicing.22476.46][1] - **Microsoft.NET.Sdk**: [from 6.0.110-servicing.22476.31 to 6.0.110-servicing.22476.46][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.10-... --- NuGet.config | 12 ++++------- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 3 files changed, 38 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index f723aa707..3e6d96c15 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -29,9 +29,7 @@ - - - + @@ -52,7 +50,7 @@ - + @@ -68,9 +66,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e95ba73e..6696e6070 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating abad6c0ec8f1f7f65a233956f4d02bbfd3cd0c27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cb11e73629ffbf6eee418a40fc602ceb752794fa + a886cd6214c92f6a5d955c056014820c35591e7b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cb11e73629ffbf6eee418a40fc602ceb752794fa + a886cd6214c92f6a5d955c056014820c35591e7b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 24d64ba63551a0f0457d62b834d043292d090815 + 729cc7ccdec38bb23e6216a371293bb5ce738b5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - bbe6a9e6d0da0f80a57f80914177691fd1f1b97e + 3bbc77257e3d51a2e19195523eafd262da1f5459 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f632ef8fb..a52e53cca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.10-servicing.22470.3 + 6.0.10-servicing.22476.6 - 6.0.10-servicing.22470.7 + 6.0.10-servicing.22476.4 @@ -46,18 +46,18 @@ 6.0.10 6.0.10 - 6.0.10-servicing.22476.12 - 6.0.10-servicing.22476.12 - 6.0.10-servicing.22476.12 - 6.0.10-servicing.22476.12 + 6.0.10-servicing.22476.17 + 6.0.10-servicing.22476.17 + 6.0.10-servicing.22476.17 + 6.0.10-servicing.22476.17 0.2.0 - 6.0.110-servicing.22476.31 - 6.0.110-servicing.22476.31 + 6.0.110-servicing.22476.46 + 6.0.110-servicing.22476.46 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.10-servicing.22470.9 - 6.0.10-servicing.22470.9 + 6.0.10-servicing.22476.6 + 6.0.10-servicing.22476.6 6.0.10 6.0.10 From 68624187969147694f78da1cc12444330b06fb1d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 27 Sep 2022 04:17:27 +0000 Subject: [PATCH 039/102] Merged PR 26236: [internal/release/6.0.4xx] 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 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.402 to 6.0.402 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.402-rtm.22476.14 to 6.0.402-rtm.22476.21 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.402 to 6.0.402 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.10-servicing.22470.3 to 6.0.10-servicing.22476.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22470.7 to 6.0.10-servicing.22476.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20220926.48 - **Date Produced**: September 27, 2022 3:42:06 AM UTC - **Commit**: 6a3751154ef2a5ab57d4bc3b62c5c8fa2d278ce6 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuild... --- NuGet.config | 20 +++++---------- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++-------- 3 files changed, 44 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index 48041fd8b..89d231a7f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -25,12 +23,10 @@ - + - - - + @@ -57,19 +53,15 @@ - - - + - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2a449246..d0df94604 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 759d4664e22f40aba187b41a7eae8c5e8b40787c + 32a619c8ec7782b8a9cd2fe6476d25197d2b4c32 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 759d4664e22f40aba187b41a7eae8c5e8b40787c + 32a619c8ec7782b8a9cd2fe6476d25197d2b4c32 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 759d4664e22f40aba187b41a7eae8c5e8b40787c + 32a619c8ec7782b8a9cd2fe6476d25197d2b4c32 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - da945c96e1700122a8b0847662dbfc4cede39cd6 + 6a3751154ef2a5ab57d4bc3b62c5c8fa2d278ce6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - da945c96e1700122a8b0847662dbfc4cede39cd6 + 6a3751154ef2a5ab57d4bc3b62c5c8fa2d278ce6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 24d64ba63551a0f0457d62b834d043292d090815 + 729cc7ccdec38bb23e6216a371293bb5ce738b5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - bbe6a9e6d0da0f80a57f80914177691fd1f1b97e + 3bbc77257e3d51a2e19195523eafd262da1f5459 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0cfb3da79..86f9cd19c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.10-servicing.22470.3 + 6.0.10-servicing.22476.6 - 6.0.10-servicing.22470.7 + 6.0.10-servicing.22476.4 @@ -46,18 +46,18 @@ 6.0.10 6.0.10 - 6.0.10-servicing.22469.29 - 6.0.10-servicing.22469.29 - 6.0.10-servicing.22469.29 - 6.0.10-servicing.22469.29 + 6.0.10-servicing.22476.17 + 6.0.10-servicing.22476.17 + 6.0.10-servicing.22476.17 + 6.0.10-servicing.22476.17 0.2.0 - 6.0.402-servicing.22476.24 - 6.0.402-servicing.22476.24 + 6.0.402-servicing.22476.48 + 6.0.402-servicing.22476.48 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.10-servicing.22470.9 - 6.0.10-servicing.22470.9 + 6.0.10-servicing.22476.6 + 6.0.10-servicing.22476.6 6.0.10 6.0.10 From de9a4b2f4b9f62cdf5b4a94cb66f9125e37b2a5c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 27 Sep 2022 04:17:31 +0000 Subject: [PATCH 040/102] Merged PR 26244: [internal/release/6.0.3xx] 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 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.10-servicing.22470.3 to 6.0.10-servicing.22476.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22470.7 to 6.0.10-servicing.22476.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220926.47 - **Date Produced**: September 27, 2022 3:41:49 AM UTC - **Commit**: 0c33071e5eddb592a4b2122ec86afb2163873b6e - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.305-servicing.22476.32 to 6.0.305-servicing.22476.47][1] - **Microsoft.NET.Sdk**: [from 6.0.305-servicing.22476.32 to 6.0.305-servicing.22476.47][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.10-... --- NuGet.config | 12 ++++------- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 3 files changed, 38 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6ad4589ff..02c6d9de0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -26,9 +26,7 @@ - - - + @@ -55,7 +53,7 @@ - + @@ -63,9 +61,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 313ce9492..75778c857 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 4c6436d0fb4378537a091f06432b306ea8ef383e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5fd3362390628630252507a10e451f4877afe1c2 + 0c33071e5eddb592a4b2122ec86afb2163873b6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5fd3362390628630252507a10e451f4877afe1c2 + 0c33071e5eddb592a4b2122ec86afb2163873b6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 24d64ba63551a0f0457d62b834d043292d090815 + 729cc7ccdec38bb23e6216a371293bb5ce738b5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - bbe6a9e6d0da0f80a57f80914177691fd1f1b97e + 3bbc77257e3d51a2e19195523eafd262da1f5459 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0b89a0a15..822921a85 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.10-servicing.22470.3 + 6.0.10-servicing.22476.6 - 6.0.10-servicing.22470.7 + 6.0.10-servicing.22476.4 @@ -46,18 +46,18 @@ 6.0.10 6.0.10 - 6.0.10-servicing.22476.12 - 6.0.10-servicing.22476.12 - 6.0.10-servicing.22476.12 - 6.0.10-servicing.22476.12 + 6.0.10-servicing.22476.17 + 6.0.10-servicing.22476.17 + 6.0.10-servicing.22476.17 + 6.0.10-servicing.22476.17 0.2.0 - 6.0.305-servicing.22476.32 - 6.0.305-servicing.22476.32 + 6.0.305-servicing.22476.47 + 6.0.305-servicing.22476.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.10-servicing.22470.9 - 6.0.10-servicing.22470.9 + 6.0.10-servicing.22476.6 + 6.0.10-servicing.22476.6 6.0.10 6.0.10 From c736ce2bddf49b8276bfc096d593d49d7da337ec Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 27 Sep 2022 23:44:43 -0700 Subject: [PATCH 041/102] 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 042/102] 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) From ba1239dfc76c8bf5025f2b96bac7e756fe55138d Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 4 Oct 2022 09:37:50 -0700 Subject: [PATCH 043/102] Update branding to 6.0.306 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e89b3f2be..813020d48 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 05 + 06 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 19a9961977f6317e47c6a8c42abf1795990f13bf Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 4 Oct 2022 09:37:55 -0700 Subject: [PATCH 044/102] Update branding to 6.0.403 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index eb64e689f..5cee88b5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 02 + 03 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From ff52e5614525035e2a8e8ea525b808893f9cda5f Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 5 Oct 2022 14:43:28 -0700 Subject: [PATCH 045/102] Revert emsdk hash --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b64731aff..2b8705345 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,7 +168,7 @@ https://github.com/dotnet/emsdk - 3f6c45a2580cd9387b643163de8136a9691764c8 + 52e9452f82e26f9fcae791e84c082ae22f1ef66f https://github.com/dotnet/source-build From 88bc331e880f561979f76c1d0d53fc824d9bb5a5 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 5 Oct 2022 14:45:05 -0700 Subject: [PATCH 046/102] Fix emsdk hash I noticed in the codeflow from 3xx to 4xx that the hash got messed up in the process and set to the 6.0.9 one. We don't believe the version needs to be updated but the hashes should match so reverting this. --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b08566090..ba9c724da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,7 +168,7 @@ https://github.com/dotnet/emsdk - 3f6c45a2580cd9387b643163de8136a9691764c8 + 52e9452f82e26f9fcae791e84c082ae22f1ef66f https://github.com/dotnet/source-build From 7536a025faa29e53fcc6fc2ffc3503ba857a787d Mon Sep 17 00:00:00 2001 From: Swapnali911 Date: Tue, 11 Oct 2022 23:01:15 +0530 Subject: [PATCH 047/102] Adding ppc64le arch for source build (#14631) --- Directory.Build.props | 1 + src/SourceBuild/tarball/content/Directory.Build.props | 1 + src/redist/targets/Crossgen.targets | 4 ++-- src/redist/targets/GenerateBundledVersions.targets | 9 ++++++--- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 15c9d27b7..b87eeccca 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -11,6 +11,7 @@ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) $(BuildArchitecture) $(BuildArchitecture) + $(BuildArchitecture) x64 diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 61cc6ff67..860785575 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -19,6 +19,7 @@ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) $(BuildArchitecture) $(BuildArchitecture) + $(BuildArchitecture) x64 false diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index c7a7642e4..da7d186a1 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -1,7 +1,7 @@ - + diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 18d05d5aa..48b9e9c43 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -168,6 +168,7 @@ linux-bionic-arm64; linux-bionic-x64; linux-bionic-x86; + linux-ppc64le; "/> - + + @@ -444,7 +447,7 @@ Copyright (c) .NET Foundation. All rights reserved. TargetingPackName="Microsoft.AspNetCore.App.Ref" TargetingPackVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)" RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**" - RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')" + RuntimePackRuntimeIdentifiers="@(AspNetCore70RuntimePackRids, '%3B')" RuntimePackExcludedRuntimeIdentifiers="android" /> @@ -569,7 +572,7 @@ Copyright (c) .NET Foundation. All rights reserved. TargetingPackName="Microsoft.AspNetCore.App.Ref" TargetingPackVersion="$(_AspNet60TargetingPackVersion)" RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**" - RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')" + RuntimePackRuntimeIdentifiers="@(AspNetCore60RuntimePackRids, '%3B')" /> Date: Tue, 11 Oct 2022 12:51:12 -0500 Subject: [PATCH 048/102] Remove llvm-project from source-build as we have removed this dependency in runtime. (#14697) * Remove llvm-project from source-build as we have removed this dependency in runtime. * Add patch for the backport PR to get this to build for now. * Remove unneeded copy of this patch. --- eng/Version.Details.xml | 5 - .../tarball/content/repos/known-good.proj | 1 - .../tarball/content/repos/llvm-project.proj | 24 -- .../content/repos/runtime-portable.proj | 1 - .../tarball/content/repos/runtime.proj | 1 - ...m-LLVM-directory-to-root-directory-t.patch | 298 ------------------ .../0004-Add-SourceBuild.props.patch | 26 -- ...ObjWriter-dependency-in-source-build.patch | 40 +++ 8 files changed, 40 insertions(+), 356 deletions(-) delete mode 100644 src/SourceBuild/tarball/content/repos/llvm-project.proj delete mode 100644 src/SourceBuild/tarball/patches/llvm-project/0003-Copy-license-form-LLVM-directory-to-root-directory-t.patch delete mode 100644 src/SourceBuild/tarball/patches/llvm-project/0004-Add-SourceBuild.props.patch create mode 100644 src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4ebae28fb..716ffbb9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,11 +17,6 @@ https://github.com/dotnet/windowsdesktop e5f1b07e2b0e290412cca52d87508ce738882eff - - https://github.com/dotnet/llvm-project - 78c9eaec7cec210dfaee9a0443d5816b59683697 - - https://github.com/dotnet/runtime b8a4363ecd194d4e7906648a505701a9d2b7aeae diff --git a/src/SourceBuild/tarball/content/repos/known-good.proj b/src/SourceBuild/tarball/content/repos/known-good.proj index 937ab8f54..50720cc4c 100644 --- a/src/SourceBuild/tarball/content/repos/known-good.proj +++ b/src/SourceBuild/tarball/content/repos/known-good.proj @@ -33,7 +33,6 @@ - diff --git a/src/SourceBuild/tarball/content/repos/llvm-project.proj b/src/SourceBuild/tarball/content/repos/llvm-project.proj deleted file mode 100644 index addb0457c..000000000 --- a/src/SourceBuild/tarball/content/repos/llvm-project.proj +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - $(BuildCommandArgs) /p:OutputRid=$(PortableRid) - $(ProjectDirectory)build$(ShellExtension) $(StandardSourceBuildArgs) $(BuildCommandArgs) - - $(ProjectDirectory)global.json - $(ProjectDirectory)NuGet.config - false - - - - - - - - - - - - diff --git a/src/SourceBuild/tarball/content/repos/runtime-portable.proj b/src/SourceBuild/tarball/content/repos/runtime-portable.proj index 6c3939492..09b4625e9 100644 --- a/src/SourceBuild/tarball/content/repos/runtime-portable.proj +++ b/src/SourceBuild/tarball/content/repos/runtime-portable.proj @@ -9,7 +9,6 @@ - diff --git a/src/SourceBuild/tarball/content/repos/runtime.proj b/src/SourceBuild/tarball/content/repos/runtime.proj index 04ff19ab1..59ea1d6fc 100644 --- a/src/SourceBuild/tarball/content/repos/runtime.proj +++ b/src/SourceBuild/tarball/content/repos/runtime.proj @@ -18,7 +18,6 @@ - diff --git a/src/SourceBuild/tarball/patches/llvm-project/0003-Copy-license-form-LLVM-directory-to-root-directory-t.patch b/src/SourceBuild/tarball/patches/llvm-project/0003-Copy-license-form-LLVM-directory-to-root-directory-t.patch deleted file mode 100644 index 868911a22..000000000 --- a/src/SourceBuild/tarball/patches/llvm-project/0003-Copy-license-form-LLVM-directory-to-root-directory-t.patch +++ /dev/null @@ -1,298 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Wed, 10 Aug 2022 23:16:19 -0500 -Subject: [PATCH] Copy license form LLVM directory to root directory to satisfy - license checker. - -Backport PR: https://github.com/dotnet/llvm-project/pull/242. - ---- - LICENSE.TXT | 279 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 279 insertions(+) - create mode 100644 LICENSE.TXT - -diff --git a/LICENSE.TXT b/LICENSE.TXT -new file mode 100644 -index 000000000000..fa6ac5400070 ---- /dev/null -+++ b/LICENSE.TXT -@@ -0,0 +1,279 @@ -+============================================================================== -+The LLVM Project is under the Apache License v2.0 with LLVM Exceptions: -+============================================================================== -+ -+ Apache License -+ Version 2.0, January 2004 -+ http://www.apache.org/licenses/ -+ -+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -+ -+ 1. Definitions. -+ -+ "License" shall mean the terms and conditions for use, reproduction, -+ and distribution as defined by Sections 1 through 9 of this document. -+ -+ "Licensor" shall mean the copyright owner or entity authorized by -+ the copyright owner that is granting the License. -+ -+ "Legal Entity" shall mean the union of the acting entity and all -+ other entities that control, are controlled by, or are under common -+ control with that entity. For the purposes of this definition, -+ "control" means (i) the power, direct or indirect, to cause the -+ direction or management of such entity, whether by contract or -+ otherwise, or (ii) ownership of fifty percent (50%) or more of the -+ outstanding shares, or (iii) beneficial ownership of such entity. -+ -+ "You" (or "Your") shall mean an individual or Legal Entity -+ exercising permissions granted by this License. -+ -+ "Source" form shall mean the preferred form for making modifications, -+ including but not limited to software source code, documentation -+ source, and configuration files. -+ -+ "Object" form shall mean any form resulting from mechanical -+ transformation or translation of a Source form, including but -+ not limited to compiled object code, generated documentation, -+ and conversions to other media types. -+ -+ "Work" shall mean the work of authorship, whether in Source or -+ Object form, made available under the License, as indicated by a -+ copyright notice that is included in or attached to the work -+ (an example is provided in the Appendix below). -+ -+ "Derivative Works" shall mean any work, whether in Source or Object -+ form, that is based on (or derived from) the Work and for which the -+ editorial revisions, annotations, elaborations, or other modifications -+ represent, as a whole, an original work of authorship. For the purposes -+ of this License, Derivative Works shall not include works that remain -+ separable from, or merely link (or bind by name) to the interfaces of, -+ the Work and Derivative Works thereof. -+ -+ "Contribution" shall mean any work of authorship, including -+ the original version of the Work and any modifications or additions -+ to that Work or Derivative Works thereof, that is intentionally -+ submitted to Licensor for inclusion in the Work by the copyright owner -+ or by an individual or Legal Entity authorized to submit on behalf of -+ the copyright owner. For the purposes of this definition, "submitted" -+ means any form of electronic, verbal, or written communication sent -+ to the Licensor or its representatives, including but not limited to -+ communication on electronic mailing lists, source code control systems, -+ and issue tracking systems that are managed by, or on behalf of, the -+ Licensor for the purpose of discussing and improving the Work, but -+ excluding communication that is conspicuously marked or otherwise -+ designated in writing by the copyright owner as "Not a Contribution." -+ -+ "Contributor" shall mean Licensor and any individual or Legal Entity -+ on behalf of whom a Contribution has been received by Licensor and -+ subsequently incorporated within the Work. -+ -+ 2. Grant of Copyright License. Subject to the terms and conditions of -+ this License, each Contributor hereby grants to You a perpetual, -+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable -+ copyright license to reproduce, prepare Derivative Works of, -+ publicly display, publicly perform, sublicense, and distribute the -+ Work and such Derivative Works in Source or Object form. -+ -+ 3. Grant of Patent License. Subject to the terms and conditions of -+ this License, each Contributor hereby grants to You a perpetual, -+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable -+ (except as stated in this section) patent license to make, have made, -+ use, offer to sell, sell, import, and otherwise transfer the Work, -+ where such license applies only to those patent claims licensable -+ by such Contributor that are necessarily infringed by their -+ Contribution(s) alone or by combination of their Contribution(s) -+ with the Work to which such Contribution(s) was submitted. If You -+ institute patent litigation against any entity (including a -+ cross-claim or counterclaim in a lawsuit) alleging that the Work -+ or a Contribution incorporated within the Work constitutes direct -+ or contributory patent infringement, then any patent licenses -+ granted to You under this License for that Work shall terminate -+ as of the date such litigation is filed. -+ -+ 4. Redistribution. You may reproduce and distribute copies of the -+ Work or Derivative Works thereof in any medium, with or without -+ modifications, and in Source or Object form, provided that You -+ meet the following conditions: -+ -+ (a) You must give any other recipients of the Work or -+ Derivative Works a copy of this License; and -+ -+ (b) You must cause any modified files to carry prominent notices -+ stating that You changed the files; and -+ -+ (c) You must retain, in the Source form of any Derivative Works -+ that You distribute, all copyright, patent, trademark, and -+ attribution notices from the Source form of the Work, -+ excluding those notices that do not pertain to any part of -+ the Derivative Works; and -+ -+ (d) If the Work includes a "NOTICE" text file as part of its -+ distribution, then any Derivative Works that You distribute must -+ include a readable copy of the attribution notices contained -+ within such NOTICE file, excluding those notices that do not -+ pertain to any part of the Derivative Works, in at least one -+ of the following places: within a NOTICE text file distributed -+ as part of the Derivative Works; within the Source form or -+ documentation, if provided along with the Derivative Works; or, -+ within a display generated by the Derivative Works, if and -+ wherever such third-party notices normally appear. The contents -+ of the NOTICE file are for informational purposes only and -+ do not modify the License. You may add Your own attribution -+ notices within Derivative Works that You distribute, alongside -+ or as an addendum to the NOTICE text from the Work, provided -+ that such additional attribution notices cannot be construed -+ as modifying the License. -+ -+ You may add Your own copyright statement to Your modifications and -+ may provide additional or different license terms and conditions -+ for use, reproduction, or distribution of Your modifications, or -+ for any such Derivative Works as a whole, provided Your use, -+ reproduction, and distribution of the Work otherwise complies with -+ the conditions stated in this License. -+ -+ 5. Submission of Contributions. Unless You explicitly state otherwise, -+ any Contribution intentionally submitted for inclusion in the Work -+ by You to the Licensor shall be under the terms and conditions of -+ this License, without any additional terms or conditions. -+ Notwithstanding the above, nothing herein shall supersede or modify -+ the terms of any separate license agreement you may have executed -+ with Licensor regarding such Contributions. -+ -+ 6. Trademarks. This License does not grant permission to use the trade -+ names, trademarks, service marks, or product names of the Licensor, -+ except as required for reasonable and customary use in describing the -+ origin of the Work and reproducing the content of the NOTICE file. -+ -+ 7. Disclaimer of Warranty. Unless required by applicable law or -+ agreed to in writing, Licensor provides the Work (and each -+ Contributor provides its Contributions) on an "AS IS" BASIS, -+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -+ implied, including, without limitation, any warranties or conditions -+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A -+ PARTICULAR PURPOSE. You are solely responsible for determining the -+ appropriateness of using or redistributing the Work and assume any -+ risks associated with Your exercise of permissions under this License. -+ -+ 8. Limitation of Liability. In no event and under no legal theory, -+ whether in tort (including negligence), contract, or otherwise, -+ unless required by applicable law (such as deliberate and grossly -+ negligent acts) or agreed to in writing, shall any Contributor be -+ liable to You for damages, including any direct, indirect, special, -+ incidental, or consequential damages of any character arising as a -+ result of this License or out of the use or inability to use the -+ Work (including but not limited to damages for loss of goodwill, -+ work stoppage, computer failure or malfunction, or any and all -+ other commercial damages or losses), even if such Contributor -+ has been advised of the possibility of such damages. -+ -+ 9. Accepting Warranty or Additional Liability. While redistributing -+ the Work or Derivative Works thereof, You may choose to offer, -+ and charge a fee for, acceptance of support, warranty, indemnity, -+ or other liability obligations and/or rights consistent with this -+ License. However, in accepting such obligations, You may act only -+ on Your own behalf and on Your sole responsibility, not on behalf -+ of any other Contributor, and only if You agree to indemnify, -+ defend, and hold each Contributor harmless for any liability -+ incurred by, or claims asserted against, such Contributor by reason -+ of your accepting any such warranty or additional liability. -+ -+ END OF TERMS AND CONDITIONS -+ -+ APPENDIX: How to apply the Apache License to your work. -+ -+ To apply the Apache License to your work, attach the following -+ boilerplate notice, with the fields enclosed by brackets "[]" -+ replaced with your own identifying information. (Don't include -+ the brackets!) The text should be enclosed in the appropriate -+ comment syntax for the file format. We also recommend that a -+ file or class name and description of purpose be included on the -+ same "printed page" as the copyright notice for easier -+ identification within third-party archives. -+ -+ Copyright [yyyy] [name of copyright owner] -+ -+ Licensed under the Apache License, Version 2.0 (the "License"); -+ you may not use this file except in compliance with the License. -+ You may obtain a copy of the License at -+ -+ http://www.apache.org/licenses/LICENSE-2.0 -+ -+ Unless required by applicable law or agreed to in writing, software -+ distributed under the License is distributed on an "AS IS" BASIS, -+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ See the License for the specific language governing permissions and -+ limitations under the License. -+ -+ -+---- LLVM Exceptions to the Apache 2.0 License ---- -+ -+As an exception, if, as a result of your compiling your source code, portions -+of this Software are embedded into an Object form of such source code, you -+may redistribute such embedded portions in such Object form without complying -+with the conditions of Sections 4(a), 4(b) and 4(d) of the License. -+ -+In addition, if you combine or link compiled forms of this Software with -+software that is licensed under the GPLv2 ("Combined Software") and if a -+court of competent jurisdiction determines that the patent provision (Section -+3), the indemnity provision (Section 9) or other Section of the License -+conflicts with the conditions of the GPLv2, you may retroactively and -+prospectively choose to deem waived or otherwise exclude such Section(s) of -+the License, but only in their entirety and only with respect to the Combined -+Software. -+ -+============================================================================== -+Software from third parties included in the LLVM Project: -+============================================================================== -+The LLVM Project contains third party software which is under different license -+terms. All such code will be identified clearly using at least one of two -+mechanisms: -+1) It will be in a separate directory tree with its own `LICENSE.txt` or -+ `LICENSE` file at the top containing the specific license and restrictions -+ which apply to that software, or -+2) It will contain specific license and restriction terms at the top of every -+ file. -+ -+============================================================================== -+Legacy LLVM License (https://llvm.org/docs/DeveloperPolicy.html#legacy): -+============================================================================== -+University of Illinois/NCSA -+Open Source License -+ -+Copyright (c) 2003-2019 University of Illinois at Urbana-Champaign. -+All rights reserved. -+ -+Developed by: -+ -+ LLVM Team -+ -+ University of Illinois at Urbana-Champaign -+ -+ http://llvm.org -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy of -+this software and associated documentation files (the "Software"), to deal with -+the Software without restriction, including without limitation the rights to -+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -+of the Software, and to permit persons to whom the Software is furnished to do -+so, subject to the following conditions: -+ -+ * Redistributions of source code must retain the above copyright notice, -+ this list of conditions and the following disclaimers. -+ -+ * Redistributions in binary form must reproduce the above copyright notice, -+ this list of conditions and the following disclaimers in the -+ documentation and/or other materials provided with the distribution. -+ -+ * Neither the names of the LLVM Team, University of Illinois at -+ Urbana-Champaign, nor the names of its contributors may be used to -+ endorse or promote products derived from this Software without specific -+ prior written permission. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE -+SOFTWARE. -+ diff --git a/src/SourceBuild/tarball/patches/llvm-project/0004-Add-SourceBuild.props.patch b/src/SourceBuild/tarball/patches/llvm-project/0004-Add-SourceBuild.props.patch deleted file mode 100644 index 02d7b7b61..000000000 --- a/src/SourceBuild/tarball/patches/llvm-project/0004-Add-SourceBuild.props.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Thu, 11 Aug 2022 01:08:46 -0500 -Subject: [PATCH] Add SourceBuild.props. - -Backport PR: https://github.com/dotnet/llvm-project/pull/242. - ---- - eng/SourceBuild.props | 8 ++++++++ - 1 file changed, 8 insertions(+) - create mode 100644 eng/SourceBuild.props - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -new file mode 100644 -index 000000000000..93e2809599f6 ---- /dev/null -+++ b/eng/SourceBuild.props -@@ -0,0 +1,8 @@ -+ -+ -+ -+ llvm-project -+ true -+ -+ -+ diff --git a/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch b/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch new file mode 100644 index 000000000..02e49eec9 --- /dev/null +++ b/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch @@ -0,0 +1,40 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Mon, 26 Sep 2022 14:25:33 -0500 +Subject: Remove LLVM ObjWriter dependency in source-build + +Backport PR: https://github.com/dotnet/runtime/pull/76206. + +--- + src/coreclr/tools/aot/ILCompiler/ILCompiler.props | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props +index 8c4fce523906e..4fd1db03e8a48 100644 +--- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props ++++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props +@@ -48,12 +48,14 @@ + + + true ++ ++ true + + + + + +- ++ + $(ObjWriterVersion) + + +@@ -62,7 +64,7 @@ + $(NetStandardLibraryVersion) + + +- ++ + PreserveNewest + false + false From 9e046a52034af352e8b070f1c5ce5f3c627a3442 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 11 Oct 2022 18:37:57 +0000 Subject: [PATCH 049/102] [release/7.0.1xx] Update dependencies from dotnet/sdk (#14705) [release/7.0.1xx] Update dependencies from dotnet/sdk - Remove backported command-line-api patch --- eng/Version.Details.xml | 16 +- eng/Versions.props | 6 +- ...s-to-net7.0-TFM-with-shared-property.patch | 268 ------------------ 3 files changed, 11 insertions(+), 279 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/command-line-api/0001-Update-projects-to-net7.0-TFM-with-shared-property.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 716ffbb9c..5e2bec25e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 047029f55d17036beb6461c894174127a8252810 + abcc883f0a1eb71d87efb4cddcf36a296c42e725 - + https://github.com/dotnet/sdk - 047029f55d17036beb6461c894174127a8252810 + abcc883f0a1eb71d87efb4cddcf36a296c42e725 - + https://github.com/dotnet/sdk - 047029f55d17036beb6461c894174127a8252810 + abcc883f0a1eb71d87efb4cddcf36a296c42e725 - + https://github.com/dotnet/sdk - 047029f55d17036beb6461c894174127a8252810 + abcc883f0a1eb71d87efb4cddcf36a296c42e725 diff --git a/eng/Versions.props b/eng/Versions.props index 6b908a727..c047f648d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.100-rtm.22510.16 - 7.0.100-rtm.22510.16 - 7.0.100-rtm.22510.16 + 7.0.100-rtm.22510.28 + 7.0.100-rtm.22510.28 + 7.0.100-rtm.22510.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) diff --git a/src/SourceBuild/tarball/patches/command-line-api/0001-Update-projects-to-net7.0-TFM-with-shared-property.patch b/src/SourceBuild/tarball/patches/command-line-api/0001-Update-projects-to-net7.0-TFM-with-shared-property.patch deleted file mode 100644 index d875d0aeb..000000000 --- a/src/SourceBuild/tarball/patches/command-line-api/0001-Update-projects-to-net7.0-TFM-with-shared-property.patch +++ /dev/null @@ -1,268 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Tue, 19 Jul 2022 14:47:28 -0700 -Subject: [PATCH] Update projects to net7.0 TFM with shared property, Only enable trimming for .NET Core - -Backport PR: https://github.com/dotnet/command-line-api/pull/1803 ---- - Directory.Build.props | 1 + - global.json | 7 ++++--- - .../System.CommandLine.ApiCompatibility.Tests.csproj | 2 +- - .../System.CommandLine.Benchmarks.csproj | 4 ++-- - .../System.CommandLine.DragonFruit.Tests.csproj | 2 +- - .../System.CommandLine.Generator.Tests.csproj | 2 +- - .../System.CommandLine.Hosting.Tests.csproj | 2 +- - .../System.CommandLine.NamingConventionBinder.Tests.csproj | 2 +- - .../System.CommandLine.Rendering.Tests.csproj | 2 +- - .../EndToEndTestApp/EndToEndTestApp.csproj | 2 +- - .../dotnet-suggest.Tests.csproj | 2 +- - src/System.CommandLine.Suggest/dotnet-suggest.csproj | 2 +- - .../System.CommandLine.Tests.csproj | 2 +- - .../TestApps/NativeAOT/NativeAOT.csproj | 4 ++-- - .../TestApps/Trimming/Trimming.csproj | 4 ++-- - src/System.CommandLine/System.CommandLine.csproj | 7 +++++-- - 16 files changed, 26 insertions(+), 21 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index c0c5f79a..901c57c7 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -9,6 +9,7 @@ - $(NoWarn);CS8714;CS8765;CS8600;CS8601;CS8602;CS8603;CS8604 - MIT - 10.0 -+ net7.0 - - - -diff --git a/global.json b/global.json -index 1c6fd268..f5bec611 100644 ---- a/global.json -+++ b/global.json -@@ -1,12 +1,13 @@ - { - "tools": { -- "dotnet": "6.0.100", -+ "dotnet": "7.0.100-preview.6.22352.1", - "runtimes": { - "dotnet": [ -- "5.0.10" -+ "5.0.17", -+ "6.0.7" - ] - }, -- "xcopy-msbuild": "16.10.0-preview2" -+ "xcopy-msbuild": "17.1.0" - }, - "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22168.2" -diff --git a/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj b/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj -index 30bcd139..4cc48fde 100644 ---- a/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj -+++ b/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj -@@ -1,7 +1,7 @@ - - - -- net6.0 -+ $(TargetFrameworkForNETSDK) - false - - -diff --git a/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj b/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj -index e54aabc4..185ba62a 100644 ---- a/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj -+++ b/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj -@@ -9,8 +9,8 @@ - false - - -- net461;net5.0;net6.0; -- net5.0;net6.0; -+ net461;net5.0;net6.0;net7.0 -+ net5.0;net6.0;net7.0 - - - False -diff --git a/src/System.CommandLine.DragonFruit.Tests/System.CommandLine.DragonFruit.Tests.csproj b/src/System.CommandLine.DragonFruit.Tests/System.CommandLine.DragonFruit.Tests.csproj -index 7eee0b38..e504f7e8 100644 ---- a/src/System.CommandLine.DragonFruit.Tests/System.CommandLine.DragonFruit.Tests.csproj -+++ b/src/System.CommandLine.DragonFruit.Tests/System.CommandLine.DragonFruit.Tests.csproj -@@ -1,6 +1,6 @@ -  - -- net6.0 -+ $(TargetFrameworkForNETSDK) - AutoGeneratedProgram - - true -diff --git a/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj b/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj -index a423eb1e..20f0f410 100644 ---- a/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj -+++ b/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj -@@ -1,6 +1,6 @@ -  - -- net6.0 -+ $(TargetFrameworkForNETSDK) - $(TargetFrameworks);net462 - true - true -diff --git a/src/System.CommandLine.Hosting.Tests/System.CommandLine.Hosting.Tests.csproj b/src/System.CommandLine.Hosting.Tests/System.CommandLine.Hosting.Tests.csproj -index 328b4e12..8e2cd6ea 100644 ---- a/src/System.CommandLine.Hosting.Tests/System.CommandLine.Hosting.Tests.csproj -+++ b/src/System.CommandLine.Hosting.Tests/System.CommandLine.Hosting.Tests.csproj -@@ -1,7 +1,7 @@ -  - - -- net6.0 -+ $(TargetFrameworkForNETSDK) - $(TargetFrameworks);net462 - false - -diff --git a/src/System.CommandLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj b/src/System.CommandLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj -index 43eb7c29..7bff1796 100644 ---- a/src/System.CommandLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj -+++ b/src/System.CommandLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj -@@ -1,6 +1,6 @@ -  - -- net6.0 -+ $(TargetFrameworkForNETSDK) - $(TargetFrameworks);net462 - 10 - -diff --git a/src/System.CommandLine.Rendering.Tests/System.CommandLine.Rendering.Tests.csproj b/src/System.CommandLine.Rendering.Tests/System.CommandLine.Rendering.Tests.csproj -index 1c116508..afd6dc6a 100644 ---- a/src/System.CommandLine.Rendering.Tests/System.CommandLine.Rendering.Tests.csproj -+++ b/src/System.CommandLine.Rendering.Tests/System.CommandLine.Rendering.Tests.csproj -@@ -1,7 +1,7 @@ - - - -- net6.0 -+ $(TargetFrameworkForNETSDK) - false - - -diff --git a/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj b/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj -index 9a3eb54d..76add0d5 100644 ---- a/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj -+++ b/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj -@@ -6,7 +6,7 @@ - - - Exe -- net6.0 -+ $(TargetFrameworkForNETSDK) - - - -diff --git a/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj b/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj -index da6abedf..f1711a10 100644 ---- a/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj -+++ b/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj -@@ -1,7 +1,7 @@ - - - -- net6.0 -+ $(TargetFrameworkForNETSDK) - - - -diff --git a/src/System.CommandLine.Suggest/dotnet-suggest.csproj b/src/System.CommandLine.Suggest/dotnet-suggest.csproj -index fd825008..ce4bda1d 100644 ---- a/src/System.CommandLine.Suggest/dotnet-suggest.csproj -+++ b/src/System.CommandLine.Suggest/dotnet-suggest.csproj -@@ -1,7 +1,7 @@ -  - - Exe -- net6.0 -+ $(TargetFrameworkForNETSDK) - true - true - dotnet-suggest -diff --git a/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj b/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj -index c1988ec4..44b5c9fc 100644 ---- a/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj -+++ b/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj -@@ -1,6 +1,6 @@ -  - -- net6.0 -+ $(TargetFrameworkForNETSDK) - $(TargetFrameworks);net462 - false - -diff --git a/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj b/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj -index b0036ed0..cc306fea 100644 ---- a/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj -+++ b/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj -@@ -2,13 +2,13 @@ - - - Exe -- net6.0 -+ $(TargetFrameworkForNETSDK) - - false - - - -- ..\..\..\System.CommandLine\bin\Release\net6.0\System.CommandLine.dll -+ ..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll - - - -diff --git a/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj b/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj -index 6dcf8892..615b0764 100644 ---- a/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj -+++ b/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj -@@ -2,7 +2,7 @@ - - - Exe -- net6.0 -+ $(TargetFrameworkForNETSDK) - enable - enable - true -@@ -10,7 +10,7 @@ - - - -- ..\..\..\System.CommandLine\bin\Release\net6.0\System.CommandLine.dll -+ ..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll - - - -diff --git a/src/System.CommandLine/System.CommandLine.csproj b/src/System.CommandLine/System.CommandLine.csproj -index 424053a6..37115d70 100644 ---- a/src/System.CommandLine/System.CommandLine.csproj -+++ b/src/System.CommandLine/System.CommandLine.csproj -@@ -3,7 +3,7 @@ - - true - System.CommandLine -- net6.0;netstandard2.0 -+ $(TargetFrameworkForNETSDK);netstandard2.0 - enable - true - 10 -@@ -15,9 +15,12 @@ - * Test and debug support - - true -+ true -+ -+ -+ - true - true -- true - - - From b389d53439cefec821ddc774d11cf002a85d004b Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Tue, 11 Oct 2022 13:43:26 -0500 Subject: [PATCH 050/102] Add support for using --with-packages with smoke-tests. (#14387) (#14587) * Add support for using --with-packages with smoke-tests. * Use a better variable name for custom packages directory. * Swap conditions so we don't have to delete the archive directory. Fixes https://github.com/dotnet/source-build/issues/2900. * Update src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs Co-authored-by: Michael Simons * Address review feedback. Co-authored-by: Michael Simons Co-authored-by: Michael Simons --- src/SourceBuild/tarball/content/build.proj | 1 + src/SourceBuild/tarball/content/build.sh | 29 ++++++++++++------- .../Config.cs | 2 ++ .../DotNetHelper.cs | 18 ++++++++++++ .../assets/local.NuGet.Config | 1 + 5 files changed, 41 insertions(+), 10 deletions(-) diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/tarball/content/build.proj index 5976d8446..3cef840dc 100644 --- a/src/SourceBuild/tarball/content/build.proj +++ b/src/SourceBuild/tarball/content/build.proj @@ -107,6 +107,7 @@ SMOKE_TESTS_SDK_TARBALL_PATH=$(SdkTarballPath); SMOKE_TESTS_TARGET_RID=$(TargetRid); SMOKE_TESTS_PORTABLE_RID=$(PortableRid); + SMOKE_TESTS_CUSTOM_PACKAGES_PATH=$(CustomSourceBuiltPackagesPath); $(CustomTestEnvVars)" /> diff --git a/src/SourceBuild/tarball/content/build.sh b/src/SourceBuild/tarball/content/build.sh index 39e5fbd11..02a288a00 100755 --- a/src/SourceBuild/tarball/content/build.sh +++ b/src/SourceBuild/tarball/content/build.sh @@ -19,8 +19,9 @@ SCRIPT_ROOT="$(cd -P "$( dirname "$0" )" && pwd)" MSBUILD_ARGUMENTS=("/flp:v=detailed") CUSTOM_REF_PACKAGES_DIR='' -CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR='' +CUSTOM_PACKAGES_DIR='' alternateTarget=false +runningSmokeTests=false CUSTOM_SDK_DIR='' while :; do @@ -41,15 +42,15 @@ while :; do ;; --run-smoke-test) alternateTarget=true + runningSmokeTests=true MSBUILD_ARGUMENTS+=( "/t:RunSmokeTest" ) ;; --with-packages) - CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR="$(cd -P "$2" && pwd)" - if [ ! -d "$CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR" ]; then - echo "Custom prviously built packages directory '$CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR' does not exist" + CUSTOM_PACKAGES_DIR="$(cd -P "$2" && pwd)" + if [ ! -d "$CUSTOM_PACKAGES_DIR" ]; then + echo "Custom prviously built packages directory '$CUSTOM_PACKAGES_DIR' does not exist" exit 1 fi - MSBUILD_ARGUMENTS+=( "/p:CustomPrebuiltSourceBuiltPackagesPath=$CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR" ) shift ;; --with-sdk) @@ -82,13 +83,21 @@ while :; do shift done +if [ "$CUSTOM_PACKAGES_DIR" != "" ]; then + if [ "$runningSmokeTests" == "true" ]; then + MSBUILD_ARGUMENTS+=( "/p:CustomSourceBuiltPackagesPath=$CUSTOM_PACKAGES_DIR" ) + else + MSBUILD_ARGUMENTS+=( "/p:CustomPrebuiltSourceBuiltPackagesPath=$CUSTOM_PACKAGES_DIR" ) + fi +fi + if [ -f "$SCRIPT_ROOT/packages/archive/archiveArtifacts.txt" ]; then ARCHIVE_ERROR=0 if [ ! -d "$SCRIPT_ROOT/.dotnet" ] && [ "$CUSTOM_SDK_DIR" == "" ]; then echo "ERROR: SDK not found at $SCRIPT_ROOT/.dotnet" ARCHIVE_ERROR=1 fi - if [ ! -f $SCRIPT_ROOT/packages/archive/Private.SourceBuilt.Artifacts*.tar.gz ] && [ "$CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR" == "" ]; then + if [ ! -f $SCRIPT_ROOT/packages/archive/Private.SourceBuilt.Artifacts*.tar.gz ] && [ "$CUSTOM_PACKAGES_DIR" == "" ]; then echo "ERROR: Private.SourceBuilt.Artifacts artifact not found at $SCRIPT_ROOT/packages/archive/ - Either run prep.sh or pass --with-packages parameter" ARCHIVE_ERROR=1 fi @@ -120,7 +129,9 @@ fi packageVersionsPath='' restoredPackagesDir="$SCRIPT_ROOT/packages/restored" -if [ -d "$SCRIPT_ROOT/packages/archive" ]; then +if [[ "$CUSTOM_PACKAGES_DIR" != "" && -f "$CUSTOM_PACKAGES_DIR/PackageVersions.props" ]]; then + packageVersionsPath="$CUSTOM_PACKAGES_DIR/PackageVersions.props" +elif [ -d "$SCRIPT_ROOT/packages/archive" ]; then sourceBuiltArchive=`find $SCRIPT_ROOT/packages/archive -maxdepth 1 -name 'Private.SourceBuilt.Artifacts*.tar.gz'` if [ -f "$SCRIPT_ROOT/packages/previously-source-built/PackageVersions.props" ]; then packageVersionsPath=$SCRIPT_ROOT/packages/previously-source-built/PackageVersions.props @@ -128,14 +139,12 @@ if [ -d "$SCRIPT_ROOT/packages/archive" ]; then tar -xzf "$sourceBuiltArchive" -C /tmp PackageVersions.props packageVersionsPath=/tmp/PackageVersions.props fi -elif [ -f "$CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR/PackageVersions.props" ]; then - packageVersionsPath="$CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR/PackageVersions.props" fi if [ ! -f "$packageVersionsPath" ]; then echo "Cannot find PackagesVersions.props. Debugging info:" echo " Attempted archive path: $SCRIPT_ROOT/packages/archive" - echo " Attempted custom PVP path: $CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR/PackageVersions.props" + echo " Attempted custom PVP path: $CUSTOM_PACKAGES_DIR/PackageVersions.props" exit 1 fi diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs index fc077fb19..b2ed5661f 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs @@ -15,6 +15,7 @@ internal static class Config public const string PoisonReportPathEnv = "SMOKE_TESTS_POISON_REPORT_PATH"; public const string PortableRidEnv = "SMOKE_TESTS_PORTABLE_RID"; public const string PrereqsPathEnv = "SMOKE_TESTS_PREREQS_PATH"; + public const string CustomPackagesPathEnv = "SMOKE_TESTS_CUSTOM_PACKAGES_PATH"; public const string SdkTarballPathEnv = "SMOKE_TESTS_SDK_TARBALL_PATH"; public const string TargetRidEnv = "SMOKE_TESTS_TARGET_RID"; public const string WarnPoisonDiffsEnv = "SMOKE_TESTS_WARN_POISON_DIFFS"; @@ -27,6 +28,7 @@ internal static class Config public static string PortableRid { get; } = Environment.GetEnvironmentVariable(PortableRidEnv) ?? throw new InvalidOperationException($"'{Config.PortableRidEnv}' must be specified"); public static string? PrereqsPath { get; } = Environment.GetEnvironmentVariable(PrereqsPathEnv); + public static string? CustomPackagesPath { get; } = Environment.GetEnvironmentVariable(CustomPackagesPathEnv); public static string? SdkTarballPath { get; } = Environment.GetEnvironmentVariable(SdkTarballPathEnv); public static string TargetRid { get; } = Environment.GetEnvironmentVariable(TargetRidEnv) ?? throw new InvalidOperationException($"'{Config.TargetRidEnv}' must be specified"); diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs index a9361453e..ae5508aa4 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs @@ -5,6 +5,7 @@ using System; using System.Diagnostics; using System.IO; +using System.Linq; using Xunit.Abstractions; namespace Microsoft.DotNet.SourceBuild.SmokeTests; @@ -66,6 +67,8 @@ internal class DotNetHelper if (useLocalPackages) { + // When using local packages this feed is always required. It contains packages that are + // not produced by source-build but are required by the various project templates. if (!Directory.Exists(Config.PrereqsPath)) { throw new InvalidOperationException( @@ -74,6 +77,21 @@ internal class DotNetHelper string nugetConfig = File.ReadAllText(nugetConfigPath); nugetConfig = nugetConfig.Replace("SMOKE_TEST_PACKAGE_FEED", Config.PrereqsPath); + + // This package feed is optional. You can use an additional feed of source-built packages to run the + // smoke-tests as offline as possible. + if (Config.CustomPackagesPath != null) + { + if (!Directory.Exists(Config.CustomPackagesPath)) + { + throw new ArgumentException($"Specified --with-packages {Config.CustomPackagesPath} does not exist."); + } + nugetConfig = nugetConfig.Replace("CUSTOM_PACKAGE_FEED", Config.CustomPackagesPath); + } + else + { + nugetConfig = string.Join(Environment.NewLine, nugetConfig.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries).Where(s => !s.Contains("CUSTOM_PACKAGE_FEED")).ToArray()); + } File.WriteAllText(nugetConfigPath, nugetConfig); } } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/local.NuGet.Config b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/local.NuGet.Config index 78195779b..feac553a9 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/local.NuGet.Config +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/local.NuGet.Config @@ -3,5 +3,6 @@ + From 12ce4c573264e653d92e57aa146326d07ccf17e5 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 11 Aug 2022 16:41:17 -0700 Subject: [PATCH 051/102] use mktemp to correctly use temp files --- src/redist/targets/packaging/deb/postinst | 3 +-- src/redist/targets/packaging/osx/clisdk/scripts/postinstall | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/redist/targets/packaging/deb/postinst b/src/redist/targets/packaging/deb/postinst index 615c17e6b..696ec8acc 100644 --- a/src/redist/targets/packaging/deb/postinst +++ b/src/redist/targets/packaging/deb/postinst @@ -4,6 +4,5 @@ first_run() { /usr/share/dotnet/dotnet exec /usr/share/dotnet/sdk/%SDK_VERSION%/dotnet.dll internal-reportinstallsuccess "debianpackage" > /dev/null 2>&1 || true } -INSTALL_TEMP_HOME=/tmp/dotnet-installer -[ -d $INSTALL_TEMP_HOME ] || mkdir $INSTALL_TEMP_HOME +INSTALL_TEMP_HOME=$(mktemp -d) # mktemp should set 700 perm automatically HOME=$INSTALL_TEMP_HOME first_run diff --git a/src/redist/targets/packaging/osx/clisdk/scripts/postinstall b/src/redist/targets/packaging/osx/clisdk/scripts/postinstall index 28339be99..86710223d 100644 --- a/src/redist/targets/packaging/osx/clisdk/scripts/postinstall +++ b/src/redist/targets/packaging/osx/clisdk/scripts/postinstall @@ -12,7 +12,7 @@ first_run() { $INSTALL_DESTINATION/dotnet exec $INSTALL_DESTINATION/sdk/%SDK_VERSION%/dotnet.dll internal-reportinstallsuccess "$1" > /dev/null 2>&1 || true } -[ -d $INSTALL_TEMP_HOME ] || mkdir $INSTALL_TEMP_HOME +INSTALL_TEMP_HOME=$(mktemp -d) # mktemp should set 700 perm automatically HOME=$INSTALL_TEMP_HOME first_run exit 0 From c516635aef289c581371a74e57e720fa9643159a Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Tue, 11 Oct 2022 15:08:43 -0500 Subject: [PATCH 052/102] Don't use the MSBuild server process for init-build.proj. (#14643) * Don't use the MSBuild server process for init-build.proj. This appears to fix an issue where our SdkResolver is not loaded because there are still lingering dotnet processes when we try to binplace the resolver DLL. * Address code review feedback. --- src/SourceBuild/tarball/content/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/SourceBuild/tarball/content/build.sh b/src/SourceBuild/tarball/content/build.sh index 0d6bbb91e..e899d2f80 100755 --- a/src/SourceBuild/tarball/content/build.sh +++ b/src/SourceBuild/tarball/content/build.sh @@ -178,6 +178,8 @@ if [ "$alternateTarget" == "true" ]; then "$CLI_ROOT/dotnet" $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll "$SCRIPT_ROOT/build.proj" /bl:$SCRIPT_ROOT/artifacts/log/Debug/BuildTests_$LogDateStamp.binlog /fileLoggerParameters:LogFile=$SCRIPT_ROOT/artifacts/logs/BuildTests_$LogDateStamp.log /clp:v=m ${MSBUILD_ARGUMENTS[@]} "$@" else $CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:$SCRIPT_ROOT/artifacts/log/Debug/BuildXPlatTasks_$LogDateStamp.binlog /fileLoggerParameters:LogFile=$SCRIPT_ROOT/artifacts/logs/BuildXPlatTasks_$LogDateStamp.log $SCRIPT_ROOT/tools-local/init-build.proj /t:PrepareOfflineLocalTools ${MSBUILD_ARGUMENTS[@]} "$@" + # kill off the MSBuild server so that on future invocations we pick up our custom SDK Resolver + $CLI_ROOT/dotnet build-server shutdown $CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:$SCRIPT_ROOT/artifacts/log/Debug/Build_$LogDateStamp.binlog /fileLoggerParameters:LogFile=$SCRIPT_ROOT/artifacts/logs/Build_$LogDateStamp.log $SCRIPT_ROOT/build.proj ${MSBUILD_ARGUMENTS[@]} "$@" fi From 96efc2a855f4ca25fa1d6d8537c6968f5e917daa Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 11 Oct 2022 16:35:00 -0500 Subject: [PATCH 053/102] [release/6.0.1xx] Enable online and offline source-build tarball build in all PRs (#14711) * Enable online and offline source-build tarball build in all PRs (#14620) * Fix source-build CI to not run tarball build when tarball creation fails (#14678) * Fix source-build CI to not run tarball build when tarball creation failed * Bad fix * Revert test patch --- .vsts-ci.yml | 8 ++++---- .../templates/job/source-build-create-tarball.yml | 12 ------------ .../templates/job/source-build-run-tarball-build.yml | 7 +------ 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index f63ac7c00..7eca85c35 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -375,10 +375,10 @@ stages: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - dependsOn: Source_Build_Create_Tarball - condition: eq(dependencies.Source_Build_Create_Tarball.outputs['Tarball_Build_Check._includeTarballBuild'], 'true') + - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + parameters: + dependsOn: Source_Build_Create_Tarball # https://github.com/dotnet/core-sdk/issues/248 # - template: /eng/build.yml diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index db3657cd9..cffdf6bdb 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -74,15 +74,3 @@ jobs: displayName: Publish BuildLogs continueOnError: true condition: succeededOrFailed() - - - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - # Check if the tarball should be built now so the result can be used in the build tarball job condition. - # This prevents allocation of additional agents if the tarball build legs should be skipped. - # Only build the tarball if the PR touches source-build source. - - script: | - if curl "https://api.github.com/repos/dotnet/installer/pulls/$(System.PullRequest.PullRequestNumber)/files" | grep '"filename": "src/SourceBuild/*' - then - echo "##vso[task.setvariable variable=_includeTarballBuild;isoutput=true]true" - fi - displayName: Tarball Build Check - name: Tarball_Build_Check 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 d927cf7f0..471f00e27 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 @@ -1,9 +1,6 @@ # Builds a source-build tarball parameters: - # Custom condition to apply to the job - condition: true - # Dependent jobs that must be completed before this job will run dependsOn: @@ -32,7 +29,6 @@ jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: architecture: x64 - condition: ${{ parameters.condition }} dependsOn: ${{ parameters.dependsOn }} ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: excludeSdkContentTests: true @@ -86,7 +82,6 @@ jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: architecture: arm64 - condition: ${{ parameters.condition }} dependsOn: ${{ parameters.dependsOn }} ${{ if in(variables['Build.Reason'], 'PullRequest') }}: excludeSdkContentTests: true @@ -108,7 +103,7 @@ jobs: architecture: x64 # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status. # The bootstrap build will shortcut if the stage 1 build failed. - condition: and(${{ parameters.condition }}, succeededOrFailed()) + condition: succeededOrFailed() dependsOn: Build_Tarball_x64 excludeSdkContentTests: true installerBuildResourceId: ${{ parameters.installerBuildResourceId }} From 5633822a17aef84365ba4e2457ee3a9c046f1014 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 11 Oct 2022 16:37:36 -0500 Subject: [PATCH 054/102] Update patch backport comments and remove obsolete patch (#14710) --- .../nuget-client/0002-Add-CA2213-NoWarn.patch | 23 ------------------- ...ilt-assets-during-source-build-for-r.patch | 2 +- ...02-Look-for-msbuild-net7.0-artifacts.patch | 3 +-- 3 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0002-Add-CA2213-NoWarn.patch diff --git a/src/SourceBuild/tarball/patches/nuget-client/0002-Add-CA2213-NoWarn.patch b/src/SourceBuild/tarball/patches/nuget-client/0002-Add-CA2213-NoWarn.patch deleted file mode 100644 index 4625e0e9a..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0002-Add-CA2213-NoWarn.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Mon, 25 Jul 2022 15:53:59 +0000 -Subject: [PATCH] Add CA2213 NoWarn - -Workaround until NuGet updates to build with latest .NET toolset. ---- - build/common.project.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build/common.project.props b/build/common.project.props -index 93287fdde..9d1fb3bce 100644 ---- a/build/common.project.props -+++ b/build/common.project.props -@@ -52,7 +52,7 @@ - $(SolutionPackagesFolder)microsoft.dotnet.maestro.tasks\1.1.0-beta.21378.2\tools\netcoreapp3.1\Microsoft.DotNet.Maestro.Tasks.dll - $(NoWarn);NU5105;MSB3277 - -- $(NoWarn);CS1998;CA1416;CS0618;CS1574 -+ $(NoWarn);CS1998;CA1416;CS0618;CS1574;CA2213 - - - diff --git a/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch b/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch index d1ae9b05d..eec487f1b 100644 --- a/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch +++ b/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch @@ -15,7 +15,7 @@ This is taking the approach used in previous versions of source-build: update th Contributes to https://github.com/dotnet/source-build/issues/2420 Contributes to https://github.com/dotnet/source-build/issues/2527 -Backport: https://github.com/dotnet/source-build/issues/2708 +Backport: https://github.com/dotnet/source-build/issues/3049 --- eng/Versions.props | 14 -------------- src/Directory.Build.targets | 5 +++-- diff --git a/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch b/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch index cf69f8b84..dd0d19c7a 100644 --- a/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch +++ b/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch @@ -3,8 +3,7 @@ From: Logan Bussell Date: Tue, 20 Sep 2022 10:10:29 -0700 Subject: [PATCH] Look for msbuild net7.0 artifacts -This patch can be removed once https://github.com/dotnet/msbuild/pull/7790 flows -into dotnet/sdk, at which point that repo will need this change. +Backport: https://github.com/dotnet/sdk/pull/28425 --- .../Microsoft.DotNet.Cli.Utils.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) From c12ac467c7864f98f54dc58c34ed2a8bddb2ffbc Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 11 Oct 2022 16:42:38 -0700 Subject: [PATCH 055/102] update global.json and Versions.props for .NET SDK 6.0.110 (#14717) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 91eac63e1..475eaf7ca 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.109-2 + 6.0.110 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 063a6c676..89a95cd0f 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.109" + "dotnet": "6.0.110" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From f3606a0adb01a11cfddda24dcc6c7dddbdf8b331 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Tue, 11 Oct 2022 17:46:30 -0700 Subject: [PATCH 056/102] [release/7.0.1xx] .NET Source-Build 7.0.100-rc.2 October 2022 Updates (#14728) * Update source-build to 7.0 RC2 * Also update tarball global.json * Don't touch root global.json in case it is managed by automation --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index c047f648d..ea9c55a4f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,7 +193,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. --> - 7.0.100-rc.1 + 7.0.100-rc.2 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 8d6aba31b..8d9568376 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100-rc.1.22431.12" + "dotnet": "7.0.100-rc.2.22477.23" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 7aec8695348a150753366b84d1f998d9d044bad4 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Tue, 11 Oct 2022 18:57:55 -0700 Subject: [PATCH 057/102] [release/6.0.1xx] Re-write dotnet-watch smoke test (#14367) * Re-write dotnet-watch smoke test * Revert async changes --- .../Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs | 6 ++++-- .../DotNetWatchTests.cs | 5 ++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs index ae5508aa4..921ab1f97 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs @@ -96,7 +96,7 @@ internal class DotNetHelper } } - public void ExecuteCmd(string args, string? workingDirectory = null, Action? additionalProcessConfigCallback = null, int expectedExitCode = 0, int millisecondTimeout = -1) + public void ExecuteCmd(string args, string? workingDirectory = null, Action? additionalProcessConfigCallback = null, int? expectedExitCode = 0, int millisecondTimeout = -1) { (Process Process, string StdOut, string StdErr) executeResult = ExecuteHelper.ExecuteProcess( DotNetPath, @@ -105,7 +105,9 @@ internal class DotNetHelper configure: (process) => configureProcess(process, workingDirectory), millisecondTimeout: millisecondTimeout); - ExecuteHelper.ValidateExitCode(executeResult, expectedExitCode); + if (expectedExitCode != null) { + ExecuteHelper.ValidateExitCode(executeResult, (int) expectedExitCode); + } void configureProcess(Process process, string? workingDirectory) { diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs index 183311037..46013bbc7 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs @@ -19,12 +19,11 @@ public class DotNetWatchTests : SmokeTests string projectDirectory = DotNetHelper.ExecuteNew(DotNetTemplate.Console.GetName(), nameof(DotNetWatchTests)); bool outputChanged = false; - // We expect an exit code of 143 (128 + 15, i.e. SIGTERM) because we are killing the process manually DotNetHelper.ExecuteCmd( "watch run", workingDirectory: projectDirectory, additionalProcessConfigCallback: processConfigCallback, - expectedExitCode: 143, + expectedExitCode: null, // The exit code does not reflect whether or not dotnet watch is working properly millisecondTimeout: 30000); Assert.True(outputChanged); @@ -52,7 +51,7 @@ public class DotNetWatchTests : SmokeTests { outputChanged = true; OutputHelper.WriteLine("Successfully re-ran program after code change."); - ExecuteHelper.ExecuteProcessValidateExitCode("kill", $"-s TERM {process.Id}", OutputHelper); + process.Kill(true); } }); } From 93dd7d66226f34f16581aab19b1ac88f6bdb3692 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 12 Oct 2022 08:11:05 -0700 Subject: [PATCH 058/102] Stable branding (#14729) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index ea9c55a4f..f543144c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,7 +16,7 @@ $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false + true release From 9bb8d116b0035f0b13bc5c603a6cfc20b1145521 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 12 Oct 2022 20:29:30 +0000 Subject: [PATCH 059/102] [release/7.0.1xx] Update dependencies from dotnet/sdk (#14725) [release/7.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-rtm.22507.2 to 7.0.0 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-rtm.22507.2 to 7.0.0-rtm.22511.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-rtm.22507.2 to 7.0.0-rtm.22511.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-rtm.22507.2 to 7.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-rtm.22506.1 to 7.0.0-rtm.22511.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-rtm.22507.2 to 7.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-rtm.22506.9 to 7.0.0-rtm.22511.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 12.0.5-beta.22507.6 to 12.0.5-beta.22510.6 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.0-beta.22507.6 to 7.0.0-beta.22510.6 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.4.0-3.22507.1 to 4.4.0-3.22511.14 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk) - Remove backported source-build patches - Merge branch 'release/7.0.1xx' of https://github.com/dotnet/installer into darc-release/7.0.1xx-629cfea0-7f3f-4b78-b783-1b6dc7af9224 --- NuGet.config | 5 + eng/Version.Details.xml | 108 +++++++++--------- eng/Versions.props | 46 ++++---- ...ty-constraints-for-BeginScope-in-Sim.patch | 24 ---- ...uilt-version-of-ref-packs-and-don-t-.patch | 37 ------ ...ObjWriter-dependency-in-source-build.patch | 40 ------- ...02-Look-for-msbuild-net7.0-artifacts.patch | 23 ---- 7 files changed, 82 insertions(+), 201 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/format/0001-Update-nullability-constraints-for-BeginScope-in-Sim.patch delete mode 100644 src/SourceBuild/tarball/patches/roslyn/0001-Use-the-source-built-version-of-ref-packs-and-don-t-.patch delete mode 100644 src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch delete mode 100644 src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch diff --git a/NuGet.config b/NuGet.config index dbd29f96e..6d004c295 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,11 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5e2bec25e..a0e08809b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - e5f1b07e2b0e290412cca52d87508ce738882eff + 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 - + https://github.com/dotnet/windowsdesktop - e5f1b07e2b0e290412cca52d87508ce738882eff + 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 - + https://github.com/dotnet/windowsdesktop - e5f1b07e2b0e290412cca52d87508ce738882eff + 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 - + https://github.com/dotnet/windowsdesktop - e5f1b07e2b0e290412cca52d87508ce738882eff + 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + d25158d0dffd699340cedcfd43324c87a809a214 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + d25158d0dffd699340cedcfd43324c87a809a214 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + d25158d0dffd699340cedcfd43324c87a809a214 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + d25158d0dffd699340cedcfd43324c87a809a214 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + d25158d0dffd699340cedcfd43324c87a809a214 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + d25158d0dffd699340cedcfd43324c87a809a214 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + d25158d0dffd699340cedcfd43324c87a809a214 - + https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + c6865355c01e1fb170b65427846d939559ab3789 - + https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + c6865355c01e1fb170b65427846d939559ab3789 - + https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + c6865355c01e1fb170b65427846d939559ab3789 - + https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + c6865355c01e1fb170b65427846d939559ab3789 - + https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + c6865355c01e1fb170b65427846d939559ab3789 - + https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + c6865355c01e1fb170b65427846d939559ab3789 - + https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + c6865355c01e1fb170b65427846d939559ab3789 https://github.com/dotnet/test-templates @@ -98,39 +98,39 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - abcc883f0a1eb71d87efb4cddcf36a296c42e725 + 6772efe6f359786e0350c0f15638d0475c95cba4 - + https://github.com/dotnet/sdk - abcc883f0a1eb71d87efb4cddcf36a296c42e725 + 6772efe6f359786e0350c0f15638d0475c95cba4 - + https://github.com/dotnet/sdk - abcc883f0a1eb71d87efb4cddcf36a296c42e725 + 6772efe6f359786e0350c0f15638d0475c95cba4 - + https://github.com/dotnet/sdk - abcc883f0a1eb71d87efb4cddcf36a296c42e725 + 6772efe6f359786e0350c0f15638d0475c95cba4 - + https://github.com/dotnet/winforms - b718d35e98c370ff27249f8f6c57325033a27c7e + 631f7cf4c165b3a3da5ab8f8e974a00c0bf067d7 - + https://github.com/dotnet/wpf - 8091341440149a2ff67ed5af6efbb43c349ee537 + fd949cc0bee03dece87b7430fbba99f150632b9d - + https://github.com/dotnet/fsharp - 532a074f9b304325d8bcd554ac73a1183b74a8f0 + 5bdd01cf158a4b214f11025fdd45ac7e4774509f - + https://github.com/dotnet/fsharp - 532a074f9b304325d8bcd554ac73a1183b74a8f0 + 5bdd01cf158a4b214f11025fdd45ac7e4774509f @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 7971633700e06fdd0a46dbae78908582ee533c2a + a9c49e8b8633005d2d03516693950037a9cf7cc7 diff --git a/eng/Versions.props b/eng/Versions.props index f543144c4..dee08608b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22506.1 + 7.0.0-rtm.22511.7 - 7.0.0-rtm.22506.9 + 7.0.0-rtm.22511.4 @@ -50,46 +50,46 @@ - 7.0.0-rtm.22504.29 - 7.0.0-rtm.22504.29 - 7.0.0-rtm.22504.29 - 7.0.0-rtm.22504.29 - 7.0.0-rtm.22504.29 - 7.0.0-rtm.22504.29 - 7.0.0-rtm.22504.29 + 7.0.0-rtm.22512.1 + 7.0.0-rtm.22512.1 + 7.0.0-rtm.22512.1 + 7.0.0-rtm.22512.1 + 7.0.0-rtm.22512.1 + 7.0.0-rtm.22512.1 + 7.0.0-rtm.22512.1 0.2.0 - 7.0.100-rtm.22510.28 - 7.0.100-rtm.22510.28 - 7.0.100-rtm.22510.28 + 7.0.100-rtm.22512.19 + 7.0.100-rtm.22512.19 + 7.0.100-rtm.22512.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rtm.22507.1 + 7.0.0-rtm.22511.4 - 7.0.0-rtm.22507.1 - 7.0.0-rtm.22507.1 - 7.0.0-rtm.22507.1 - 7.0.0-rtm.22507.1 - 7.0.0-rtm.22507.1 - 7.0.0-rtm.22507.1 + 7.0.0-rtm.22511.4 + 7.0.0-rtm.22511.4 + 7.0.0-rtm.22511.4 + 7.0.0-rtm.22511.4 + 7.0.0-rtm.22511.4 + 7.0.0-rtm.22511.4 2.1.0 - 7.0.0-rtm.22507.2 - 7.0.0-rtm.22507.2 - 7.0.0-rtm.22507.2 - 7.0.0-rtm.22507.2 + 7.0.0-rtm.22511.3 + 7.0.0-rtm.22511.3 + 7.0.0 + 7.0.0 diff --git a/src/SourceBuild/tarball/patches/format/0001-Update-nullability-constraints-for-BeginScope-in-Sim.patch b/src/SourceBuild/tarball/patches/format/0001-Update-nullability-constraints-for-BeginScope-in-Sim.patch deleted file mode 100644 index 2285f0472..000000000 --- a/src/SourceBuild/tarball/patches/format/0001-Update-nullability-constraints-for-BeginScope-in-Sim.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Mon, 16 May 2022 16:29:43 -0700 -Subject: [PATCH] Update nullability constraints for BeginScope in - SimpleConsoleLogger - -Workaround for: https://github.com/dotnet/format/issues/1609 ---- - src/Logging/SimpleConsoleLogger.cs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Logging/SimpleConsoleLogger.cs b/src/Logging/SimpleConsoleLogger.cs -index fd8015c..2971595 100644 ---- a/src/Logging/SimpleConsoleLogger.cs -+++ b/src/Logging/SimpleConsoleLogger.cs -@@ -64,7 +64,7 @@ public bool IsEnabled(LogLevel logLevel) - return (int)logLevel >= (int)_minimalLogLevel; - } - -- public IDisposable BeginScope(TState state) -+ public IDisposable? BeginScope(TState state) where TState : notnull - { - return NullScope.Instance; - } diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-Use-the-source-built-version-of-ref-packs-and-don-t-.patch b/src/SourceBuild/tarball/patches/roslyn/0001-Use-the-source-built-version-of-ref-packs-and-don-t-.patch deleted file mode 100644 index 1a9573cb5..000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0001-Use-the-source-built-version-of-ref-packs-and-don-t-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Thu, 15 Sep 2022 14:46:53 -0500 -Subject: [PATCH] Use the source-built version of ref packs and don't use app - host when building in source-build. - -Backport PR: https://github.com/dotnet/roslyn/pull/64055. - ---- - Directory.Build.targets | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/Directory.Build.targets b/Directory.Build.targets -index 8f38a48cd95..dfb4fd33c9a 100644 ---- a/Directory.Build.targets -+++ b/Directory.Build.targets -@@ -1,5 +1,20 @@ - - -+ -+ -+ -+ 6.0.0 -+ -+ -+ 6.0.0 -+ -+ -+ -+ -+ -+ false -+ -+ - - - diff --git a/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch b/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch deleted file mode 100644 index 02e49eec9..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Mon, 26 Sep 2022 14:25:33 -0500 -Subject: Remove LLVM ObjWriter dependency in source-build - -Backport PR: https://github.com/dotnet/runtime/pull/76206. - ---- - src/coreclr/tools/aot/ILCompiler/ILCompiler.props | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props -index 8c4fce523906e..4fd1db03e8a48 100644 ---- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props -+++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props -@@ -48,12 +48,14 @@ - - - true -+ -+ true - - - - - -- -+ - $(ObjWriterVersion) - - -@@ -62,7 +64,7 @@ - $(NetStandardLibraryVersion) - - -- -+ - PreserveNewest - false - false diff --git a/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch b/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch deleted file mode 100644 index dd0d19c7a..000000000 --- a/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Tue, 20 Sep 2022 10:10:29 -0700 -Subject: [PATCH] Look for msbuild net7.0 artifacts - -Backport: https://github.com/dotnet/sdk/pull/28425 ---- - .../Microsoft.DotNet.Cli.Utils.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj -index 03ea923734..3246138cf9 100644 ---- a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj -+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj -@@ -22,7 +22,7 @@ - - - -- $(PkgMicrosoft_Build_Runtime)\contentFiles\any\net6.0\MSBuild.dll -+ $(PkgMicrosoft_Build_Runtime)\contentFiles\any\net7.0\MSBuild.dll - - - From 0263b7b7dacffa82e41b4e3e63cb83e371cd7f5d Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 12 Oct 2022 14:14:53 -0700 Subject: [PATCH 060/102] [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#14726) * [release/6.0.1xx] Enable online and offline source-build tarball build in all PRs (#14711) * Enable online and offline source-build tarball build in all PRs (#14620) * Fix source-build CI to not run tarball build when tarball creation fails (#14678) * Fix source-build CI to not run tarball build when tarball creation failed * Bad fix * Revert test patch * update global.json and Versions.props for .NET SDK 6.0.110 (#14717) * [release/6.0.1xx] Re-write dotnet-watch smoke test (#14367) * Re-write dotnet-watch smoke test * Revert async changes * Disable source-build tarball validation for non 6.0.1xx legs Co-authored-by: Michael Simons Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Co-authored-by: Logan Bussell Co-authored-by: Jason Zhai --- .vsts-ci.yml | 9 +++++---- .../templates/job/source-build-create-tarball.yml | 15 --------------- .../job/source-build-run-tarball-build.yml | 7 +------ .../DotNetHelper.cs | 6 ++++-- .../DotNetWatchTests.cs | 5 ++--- 5 files changed, 12 insertions(+), 30 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index ab1e20400..86a77511e 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -375,10 +375,11 @@ stages: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - dependsOn: Source_Build_Create_Tarball - condition: eq(dependencies.Source_Build_Create_Tarball.outputs['Tarball_Build_Check._includeTarballBuild'], 'true') + # For .NET 6.0, source-build only supports 6.0.1xx. Disable tarball build validation in all other branches. + # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + # parameters: + # dependsOn: Source_Build_Create_Tarball # https://github.com/dotnet/core-sdk/issues/248 # - template: /eng/build.yml diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index 8efb389d3..cffdf6bdb 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -74,18 +74,3 @@ jobs: displayName: Publish BuildLogs continueOnError: true condition: succeededOrFailed() - - - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - # Check if the tarball should be built now so the result can be used in the build tarball job condition. - # This prevents allocation of additional agents if the tarball build legs should be skipped. - # Only build the tarball if the PR touches source-build source. - - script: | - # Temporarily disable tarball PR validation until source-build is supported in this channel. - echo "##vso[task.setvariable variable=_includeTarballBuild;isoutput=true]false" - - # if curl "https://api.github.com/repos/dotnet/installer/pulls/$(System.PullRequest.PullRequestNumber)/files" | grep '"filename": "src/SourceBuild/*' - # then - # echo "##vso[task.setvariable variable=_includeTarballBuild;isoutput=true]true" - # fi - displayName: Tarball Build Check - name: Tarball_Build_Check 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 e5e4f7e9a..13bcd2497 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 @@ -1,9 +1,6 @@ # Builds a source-build tarball parameters: - # Custom condition to apply to the job - condition: true - # Dependent jobs that must be completed before this job will run dependsOn: @@ -32,7 +29,6 @@ jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: architecture: x64 - condition: ${{ parameters.condition }} dependsOn: ${{ parameters.dependsOn }} ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: excludeSdkContentTests: true @@ -86,7 +82,6 @@ jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: architecture: arm64 - condition: ${{ parameters.condition }} dependsOn: ${{ parameters.dependsOn }} ${{ if in(variables['Build.Reason'], 'PullRequest') }}: excludeSdkContentTests: true @@ -108,7 +103,7 @@ jobs: architecture: x64 # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status. # The bootstrap build will shortcut if the stage 1 build failed. - condition: and(${{ parameters.condition }}, succeededOrFailed()) + condition: succeededOrFailed() dependsOn: Build_Tarball_x64 excludeSdkContentTests: true installerBuildResourceId: ${{ parameters.installerBuildResourceId }} diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs index ae5508aa4..921ab1f97 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs @@ -96,7 +96,7 @@ internal class DotNetHelper } } - public void ExecuteCmd(string args, string? workingDirectory = null, Action? additionalProcessConfigCallback = null, int expectedExitCode = 0, int millisecondTimeout = -1) + public void ExecuteCmd(string args, string? workingDirectory = null, Action? additionalProcessConfigCallback = null, int? expectedExitCode = 0, int millisecondTimeout = -1) { (Process Process, string StdOut, string StdErr) executeResult = ExecuteHelper.ExecuteProcess( DotNetPath, @@ -105,7 +105,9 @@ internal class DotNetHelper configure: (process) => configureProcess(process, workingDirectory), millisecondTimeout: millisecondTimeout); - ExecuteHelper.ValidateExitCode(executeResult, expectedExitCode); + if (expectedExitCode != null) { + ExecuteHelper.ValidateExitCode(executeResult, (int) expectedExitCode); + } void configureProcess(Process process, string? workingDirectory) { diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs index 183311037..46013bbc7 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs @@ -19,12 +19,11 @@ public class DotNetWatchTests : SmokeTests string projectDirectory = DotNetHelper.ExecuteNew(DotNetTemplate.Console.GetName(), nameof(DotNetWatchTests)); bool outputChanged = false; - // We expect an exit code of 143 (128 + 15, i.e. SIGTERM) because we are killing the process manually DotNetHelper.ExecuteCmd( "watch run", workingDirectory: projectDirectory, additionalProcessConfigCallback: processConfigCallback, - expectedExitCode: 143, + expectedExitCode: null, // The exit code does not reflect whether or not dotnet watch is working properly millisecondTimeout: 30000); Assert.True(outputChanged); @@ -52,7 +51,7 @@ public class DotNetWatchTests : SmokeTests { outputChanged = true; OutputHelper.WriteLine("Successfully re-ran program after code change."); - ExecuteHelper.ExecuteProcessValidateExitCode("kill", $"-s TERM {process.Id}", OutputHelper); + process.Kill(true); } }); } From 0de6184891f07ded74568db355145944bdd6bd40 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 12 Oct 2022 16:43:50 -0700 Subject: [PATCH 061/102] Update asp.net templates (#14687) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index d3505f602..8acc9fbe8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,7 +131,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.29 + 3.1.30 3.2.1 4.8.0-rc2.19462.10 From ab2fa017423c66dd6e088dfef2d21985f91a0160 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 12 Oct 2022 16:48:00 -0700 Subject: [PATCH 062/102] Update asp.net templates (#14688) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 5cee88b5d..86400b0ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,7 +131,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.29 + 3.1.30 3.2.1 4.8.0-rc2.19462.10 From 9a76ba2452c9070b41223feb37cab6d20b5ebc2f Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 12 Oct 2022 18:16:20 -0700 Subject: [PATCH 063/102] Update asp.net templates (#14689) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index dee08608b..3361abd67 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -135,7 +135,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) - 6.0.9 + 6.0.10 $(MicrosoftWinFormsProjectTemplates50PackageVersion) $(MicrosoftWPFProjectTemplates50PackageVersion) @@ -150,7 +150,7 @@ 3.1.27 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.29 + 3.1.30 3.2.1 4.8.0-rc2.19462.10 From 1a77d838c59afa155ade65f9c70a9186579a00c6 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 12 Oct 2022 18:51:21 -0700 Subject: [PATCH 064/102] Update asp.net templates (#14686) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 475eaf7ca..8f2444de9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,7 +131,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.29 + 3.1.30 3.2.1 4.8.0-rc2.19462.10 From d41bfecf5090e9163aa2da251246abed9e756e53 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Thu, 13 Oct 2022 06:05:35 -0700 Subject: [PATCH 065/102] [release/7.0.1xx] Port dotnet-watch smoke test fixes (#14738) * [release/6.0.1xx] Re-write dotnet-watch smoke test (#14367) * Re-write dotnet-watch smoke test * Revert async changes * Re-enable dotnet-watch test --- .../DotNetHelper.cs | 6 ++++-- .../DotNetWatchTests.cs | 8 +++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs index ae5508aa4..921ab1f97 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs @@ -96,7 +96,7 @@ internal class DotNetHelper } } - public void ExecuteCmd(string args, string? workingDirectory = null, Action? additionalProcessConfigCallback = null, int expectedExitCode = 0, int millisecondTimeout = -1) + public void ExecuteCmd(string args, string? workingDirectory = null, Action? additionalProcessConfigCallback = null, int? expectedExitCode = 0, int millisecondTimeout = -1) { (Process Process, string StdOut, string StdErr) executeResult = ExecuteHelper.ExecuteProcess( DotNetPath, @@ -105,7 +105,9 @@ internal class DotNetHelper configure: (process) => configureProcess(process, workingDirectory), millisecondTimeout: millisecondTimeout); - ExecuteHelper.ValidateExitCode(executeResult, expectedExitCode); + if (expectedExitCode != null) { + ExecuteHelper.ValidateExitCode(executeResult, (int) expectedExitCode); + } void configureProcess(Process process, string? workingDirectory) { diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs index f2dc2a75b..46013bbc7 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs @@ -13,19 +13,17 @@ public class DotNetWatchTests : SmokeTests { public DotNetWatchTests(ITestOutputHelper outputHelper) : base(outputHelper) { } - // TODO: Re-enable https://github.com/dotnet/source-build/issues/2961 - // [Fact] + [Fact] public void WatchTests() { string projectDirectory = DotNetHelper.ExecuteNew(DotNetTemplate.Console.GetName(), nameof(DotNetWatchTests)); bool outputChanged = false; - // We expect an exit code of 143 (128 + 15, i.e. SIGTERM) because we are killing the process manually DotNetHelper.ExecuteCmd( "watch run", workingDirectory: projectDirectory, additionalProcessConfigCallback: processConfigCallback, - expectedExitCode: 143, + expectedExitCode: null, // The exit code does not reflect whether or not dotnet watch is working properly millisecondTimeout: 30000); Assert.True(outputChanged); @@ -53,7 +51,7 @@ public class DotNetWatchTests : SmokeTests { outputChanged = true; OutputHelper.WriteLine("Successfully re-ran program after code change."); - ExecuteHelper.ExecuteProcessValidateExitCode("kill", $"-s TERM {process.Id}", OutputHelper); + process.Kill(true); } }); } From 1b456c2e569bdff61acd547e1e53f8ba1a331a8e Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Thu, 13 Oct 2022 10:22:16 -0700 Subject: [PATCH 066/102] [automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#14747) * [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#14726) * [release/6.0.1xx] Enable online and offline source-build tarball build in all PRs (#14711) * Enable online and offline source-build tarball build in all PRs (#14620) * Fix source-build CI to not run tarball build when tarball creation fails (#14678) * Fix source-build CI to not run tarball build when tarball creation failed * Bad fix * Revert test patch * update global.json and Versions.props for .NET SDK 6.0.110 (#14717) * [release/6.0.1xx] Re-write dotnet-watch smoke test (#14367) * Re-write dotnet-watch smoke test * Revert async changes * Disable source-build tarball validation for non 6.0.1xx legs Co-authored-by: Michael Simons Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Co-authored-by: Logan Bussell Co-authored-by: Jason Zhai * Update asp.net templates (#14687) * Update asp.net templates (#14688) Co-authored-by: Michael Simons Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Co-authored-by: Logan Bussell Co-authored-by: Jason Zhai Co-authored-by: Marc Paine Co-authored-by: William Godbe Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> From dd7d88e07597ed7a28c02b7747e58a2a106311d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Oct 2022 17:47:09 +0000 Subject: [PATCH 067/102] Update dependencies from https://github.com/dotnet/arcade build 20221012.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22463.7 -> To Version 6.0.0-beta.22512.3 --- NuGet.config | 9 --------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/build.ps1 | 5 +++++ eng/common/init-tools-native.ps1 | 1 + global.json | 6 +++--- 6 files changed, 16 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 064b33cd4..9ee0fa704 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,16 @@ - - - - - @@ -42,15 +37,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1590bda3d..05c953b36 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 2fbe602d12256bf82de53791ddcbb964c1541b4e + bb1e72113a7eaf8bebda940beba8cf8bee1b453f - + https://github.com/dotnet/arcade - 2fbe602d12256bf82de53791ddcbb964c1541b4e + bb1e72113a7eaf8bebda940beba8cf8bee1b453f - + https://github.com/dotnet/arcade - 2fbe602d12256bf82de53791ddcbb964c1541b4e + bb1e72113a7eaf8bebda940beba8cf8bee1b453f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 8f2444de9..5022d3548 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22463.7 + 6.0.0-beta.22512.3 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 8943da242..33a6f2d0e 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -26,6 +26,7 @@ Param( [string] $runtimeSourceFeed = '', [string] $runtimeSourceFeedKey = '', [switch] $excludePrereleaseVS, + [switch] $nativeToolsOnMachine, [switch] $help, [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) @@ -67,6 +68,7 @@ function Print-Usage() { Write-Host " -warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio" + Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)" Write-Host "" Write-Host "Command line arguments not listed above are passed thru to msbuild." @@ -146,6 +148,9 @@ try { $nodeReuse = $false } + if ($nativeToolsOnMachine) { + $env:NativeToolsOnMachine = $true + } if ($restore) { InitializeNativeTools } diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index 7428ef880..6c7a851a8 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -112,6 +112,7 @@ try { $ToolPath = Convert-Path -Path $BinPath Write-Host "Adding $ToolName to the path ($ToolPath)..." Write-Host "##vso[task.prependpath]$ToolPath" + $env:PATH = "$ToolPath;$env:PATH" $InstalledTools += @{ $ToolName = $ToolDirectory.FullName } } } diff --git a/global.json b/global.json index 9d1e2d901..20ae9a5af 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.109", + "dotnet": "6.0.110", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22463.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22463.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22512.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22512.3" } } From dbecfaddc053e1f55158ebe230959cfbf0a16a48 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 13 Oct 2022 11:46:00 -0700 Subject: [PATCH 068/102] Update dependencies from https://github.com/dotnet/arcade build 20221012.3 (#14755) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22463.7 -> To Version 6.0.0-beta.22512.3 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 7 ------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/build.ps1 | 5 +++++ eng/common/init-tools-native.ps1 | 1 + global.json | 6 +++--- 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index e00e01da1..9a84139e5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,12 +7,8 @@ - - - - @@ -39,9 +35,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b8705345..295136e2a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 2fbe602d12256bf82de53791ddcbb964c1541b4e + bb1e72113a7eaf8bebda940beba8cf8bee1b453f - + https://github.com/dotnet/arcade - 2fbe602d12256bf82de53791ddcbb964c1541b4e + bb1e72113a7eaf8bebda940beba8cf8bee1b453f - + https://github.com/dotnet/arcade - 2fbe602d12256bf82de53791ddcbb964c1541b4e + bb1e72113a7eaf8bebda940beba8cf8bee1b453f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 86400b0ba..204c9d28f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22463.7 + 6.0.0-beta.22512.3 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 8943da242..33a6f2d0e 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -26,6 +26,7 @@ Param( [string] $runtimeSourceFeed = '', [string] $runtimeSourceFeedKey = '', [switch] $excludePrereleaseVS, + [switch] $nativeToolsOnMachine, [switch] $help, [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) @@ -67,6 +68,7 @@ function Print-Usage() { Write-Host " -warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio" + Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)" Write-Host "" Write-Host "Command line arguments not listed above are passed thru to msbuild." @@ -146,6 +148,9 @@ try { $nodeReuse = $false } + if ($nativeToolsOnMachine) { + $env:NativeToolsOnMachine = $true + } if ($restore) { InitializeNativeTools } diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index 7428ef880..6c7a851a8 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -112,6 +112,7 @@ try { $ToolPath = Convert-Path -Path $BinPath Write-Host "Adding $ToolName to the path ($ToolPath)..." Write-Host "##vso[task.prependpath]$ToolPath" + $env:PATH = "$ToolPath;$env:PATH" $InstalledTools += @{ $ToolName = $ToolDirectory.FullName } } } diff --git a/global.json b/global.json index 9d1e2d901..20ae9a5af 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.109", + "dotnet": "6.0.110", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22463.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22463.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22512.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22512.3" } } From fbaf01806695d66444f36203b475ce6d34193488 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Thu, 13 Oct 2022 12:28:39 -0700 Subject: [PATCH 069/102] [release/7.0.1xx] Change 6's to 7's in Readme for source-build (#14736) * Change 6's to 7's in readme * Further clarify support for multiple releases * Remove both --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 686aa0dd7..808010978 100644 --- a/README.md +++ b/README.md @@ -43,8 +43,8 @@ Please see the [dotnet/source-build](https://github.com/dotnet/source-build) rep ## Support -.NET Source-Build is supported on the oldest available .NET SDK feature update, and on Linux only. -For example, if both .NET 6.0.1XX and 6.0.2XX feature updates are available from [dotnet.microsoft.com](https://dotnet.microsoft.com/en-us/download/dotnet/6.0), Source-Build will only support 6.0.1XX. +.NET Source-Build is supported on the oldest available .NET SDK feature update for each major release, and on Linux only. +For example, if .NET 6.0.1xx, 6.0.2xx, and 7.0.1xx feature updates are available from [dotnet.microsoft.com](https://dotnet.microsoft.com/en-us/download/dotnet/6.0), Source-Build will support 6.0.1xx and 7.0.1xx. For the latest information about Source-Build support for new .NET versions, please check our [GitHub Discussions page](https://github.com/dotnet/source-build/discussions) for announcements. ## Prerequisites @@ -79,7 +79,7 @@ The dependencies for building .NET from source can be found [here](https://githu ``` This builds the entire .NET SDK from source. - The resulting SDK is placed at `artifacts/x64/Release/dotnet-sdk-6.0.100-fedora.33-x64.tar.gz`. + The resulting SDK is placed at `artifacts/x64/Release/dotnet-sdk-7.0.100-your-RID.tar.gz`. Optionally add the `--online` flag to add online NuGet restore sources to the build. This is useful for testing unsupported releases that don't yet build without downloading pre-built binaries from the internet. @@ -90,7 +90,7 @@ The dependencies for building .NET from source can be found [here](https://githu ```bash mkdir -p $HOME/dotnet - tar zxf artifacts/x64/Release/dotnet-sdk-6.0.100-fedora.33-x64.tar.gz -C $HOME/dotnet + tar zxf artifacts/x64/Release/dotnet-sdk-7.0.100-your-RID.tar.gz -C $HOME/dotnet ln -s $HOME/dotnet/dotnet /usr/bin/dotnet ``` From 810bfe60b3c248179cc2e1bbce1c08df359503e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Oct 2022 21:45:52 +0000 Subject: [PATCH 070/102] [release/7.0.1xx] Update dependencies from dotnet/arcade (#14768) [release/7.0.1xx] Update dependencies from dotnet/arcade - Upgrade SourceBuild tasks to net7. --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/build.ps1 | 5 +++++ eng/common/init-tools-native.ps1 | 6 ++++-- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 6 +++--- src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj | 2 +- src/SourceBuild/Arcade/tools/BuildTasks.props | 2 +- 9 files changed, 24 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a0e08809b..f8cfdc859 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,18 +188,18 @@ - + https://github.com/dotnet/arcade - 720af493900b2f2bdc48e9ee12577983a5c9be36 + 02e28316bf35d1028683ee313f0794776bff18d1 - + https://github.com/dotnet/arcade - 720af493900b2f2bdc48e9ee12577983a5c9be36 + 02e28316bf35d1028683ee313f0794776bff18d1 - + https://github.com/dotnet/arcade - 720af493900b2f2bdc48e9ee12577983a5c9be36 + 02e28316bf35d1028683ee313f0794776bff18d1 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 3361abd67..d393c52c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.22464.4 + 7.0.0-beta.22513.4 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 8943da242..e0420a642 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -26,6 +26,7 @@ Param( [string] $runtimeSourceFeed = '', [string] $runtimeSourceFeedKey = '', [switch] $excludePrereleaseVS, + [switch] $nativeToolsOnMachine, [switch] $help, [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) @@ -66,6 +67,7 @@ function Print-Usage() { Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build" Write-Host " -warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." + Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)" Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio" Write-Host "" @@ -146,6 +148,9 @@ try { $nodeReuse = $false } + if ($nativeToolsOnMachine) { + $env:NativeToolsOnMachine = $true + } if ($restore) { InitializeNativeTools } diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index 8d48ec568..fbc67effc 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -98,11 +98,12 @@ try { Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed." exit 1 } - $ToolDirectory = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending)[0] - if ([string]::IsNullOrWhiteSpace($ToolDirectory)) { + $ToolDirectories = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending) + if ($ToolDirectories -eq $null) { Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image." exit 1 } + $ToolDirectory = $ToolDirectories[0] $BinPathFile = "$($ToolDirectory.FullName)\binpath.txt" if (-not (Test-Path -Path "$BinPathFile")) { Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool." @@ -112,6 +113,7 @@ try { $ToolPath = Convert-Path -Path $BinPath Write-Host "Adding $ToolName to the path ($ToolPath)..." Write-Host "##vso[task.prependpath]$ToolPath" + $env:PATH = "$ToolPath;$env:PATH" $InstalledTools += @{ $ToolName = $ToolDirectory.FullName } } } diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index c35087a06..39be08d4b 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.2.1" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.3.1" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index aba6308ad..449126943 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -365,8 +365,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.2.1&view=overview - $defaultXCopyMSBuildVersion = '17.2.1' + # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.3.1view=overview + $defaultXCopyMSBuildVersion = '17.3.1' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index b1eb0b472..b75566e99 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100-rc.1.22431.12", + "dotnet": "7.0.100-rc.2.22477.23", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22464.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22464.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22513.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22513.4" } } diff --git a/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj b/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj index 735289e70..2842d265d 100644 --- a/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj +++ b/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj @@ -1,6 +1,6 @@ - net5.0 + net7.0 false false disable diff --git a/src/SourceBuild/Arcade/tools/BuildTasks.props b/src/SourceBuild/Arcade/tools/BuildTasks.props index 4014b87ad..50f49046b 100644 --- a/src/SourceBuild/Arcade/tools/BuildTasks.props +++ b/src/SourceBuild/Arcade/tools/BuildTasks.props @@ -2,6 +2,6 @@ - $(RepoRoot)\artifacts\bin\SourceBuild.Tasks\$(Configuration)\net5.0\SourceBuild.Tasks.dll + $(RepoRoot)\artifacts\bin\SourceBuild.Tasks\$(Configuration)\net7.0\SourceBuild.Tasks.dll \ No newline at end of file From ae56e0f10c6c5d4681f7975e5e4bca9acbcec5a5 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 19 Oct 2022 18:09:33 -0400 Subject: [PATCH 071/102] Add support for ARM platform (#14592) --- Directory.Build.props | 2 +- Native.sln | 6 ++++++ eng/Build.props | 2 +- src/SourceBuild/tarball/content/Directory.Build.props | 2 +- src/SourceBuild/tarball/content/repos/known-good.proj | 3 ++- src/SourceBuild/tarball/content/repos/runtime.common.props | 2 +- src/SourceBuild/tarball/content/tools-local/init-build.proj | 2 +- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index b87eeccca..2b9d318a6 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -9,7 +9,7 @@ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) - $(BuildArchitecture) + $(BuildArchitecture) $(BuildArchitecture) $(BuildArchitecture) x64 diff --git a/Native.sln b/Native.sln index 7ce79b609..29bd74903 100644 --- a/Native.sln +++ b/Native.sln @@ -12,9 +12,11 @@ Global Debug|x86 = Debug|x86 Debug|x64 = Debug|x64 Debug|arm64 = Debug|arm64 + Debug|arm = Debug|arm Release|x86 = Release|x86 Release|x64 = Release|x64 Release|arm64 = Release|arm64 + Release|arm = Release|arm EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {688E2883-C5A9-4D66-A207-772C9160989C}.Debug|x86.ActiveCfg = Debug|x86 @@ -23,12 +25,16 @@ Global {688E2883-C5A9-4D66-A207-772C9160989C}.Debug|x64.Build.0 = Debug|x64 {688E2883-C5A9-4D66-A207-772C9160989C}.Debug|arm64.ActiveCfg = Debug|arm64 {688E2883-C5A9-4D66-A207-772C9160989C}.Debug|arm64.Build.0 = Debug|arm64 + {688E2883-C5A9-4D66-A207-772C9160989C}.Debug|arm.ActiveCfg = Debug|arm + {688E2883-C5A9-4D66-A207-772C9160989C}.Debug|arm.Build.0 = Debug|arm {688E2883-C5A9-4D66-A207-772C9160989C}.Release|x86.ActiveCfg = Release|x86 {688E2883-C5A9-4D66-A207-772C9160989C}.Release|x86.Build.0 = Release|x86 {688E2883-C5A9-4D66-A207-772C9160989C}.Release|x64.ActiveCfg = Release|x64 {688E2883-C5A9-4D66-A207-772C9160989C}.Release|x64.Build.0 = Release|x64 {688E2883-C5A9-4D66-A207-772C9160989C}.Release|arm64.ActiveCfg = Release|arm64 {688E2883-C5A9-4D66-A207-772C9160989C}.Release|arm64.Build.0 = Release|arm64 + {688E2883-C5A9-4D66-A207-772C9160989C}.Release|arm.ActiveCfg = Release|arm + {688E2883-C5A9-4D66-A207-772C9160989C}.Release|arm.Build.0 = Release|arm EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/eng/Build.props b/eng/Build.props index 4df683bab..874132e36 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -1,7 +1,7 @@ - diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 860785575..3ffe8c56a 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -17,7 +17,7 @@ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) - $(BuildArchitecture) + $(BuildArchitecture) $(BuildArchitecture) $(BuildArchitecture) x64 diff --git a/src/SourceBuild/tarball/content/repos/known-good.proj b/src/SourceBuild/tarball/content/repos/known-good.proj index 50720cc4c..6f96a2fdf 100644 --- a/src/SourceBuild/tarball/content/repos/known-good.proj +++ b/src/SourceBuild/tarball/content/repos/known-good.proj @@ -18,7 +18,8 @@ - + + diff --git a/src/SourceBuild/tarball/content/repos/runtime.common.props b/src/SourceBuild/tarball/content/repos/runtime.common.props index 3269a3f63..cb02932f9 100644 --- a/src/SourceBuild/tarball/content/repos/runtime.common.props +++ b/src/SourceBuild/tarball/content/repos/runtime.common.props @@ -13,7 +13,7 @@ $(StandardSourceBuildArgs.Replace('-bl', '-nobl')) $(StandardSourceBuildCommand) $(BuildCommandArgs) - $(ArmEnvironmentVariables) $(StandardSourceBuildCommand) $(BuildCommandArgs) + $(ArmEnvironmentVariables) $(StandardSourceBuildCommand) $(BuildCommandArgs) $(ProjectDirectory)/clean$(ShellExtension) diff --git a/src/SourceBuild/tarball/content/tools-local/init-build.proj b/src/SourceBuild/tarball/content/tools-local/init-build.proj index 701f76c0c..b2c3beed1 100644 --- a/src/SourceBuild/tarball/content/tools-local/init-build.proj +++ b/src/SourceBuild/tarball/content/tools-local/init-build.proj @@ -138,7 +138,7 @@ - + From e6dd91c290b808f971a1ac69c2fb29395bbf1051 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 19 Oct 2022 17:25:52 -0500 Subject: [PATCH 072/102] Update source-build tarball CI to utilize faster build agents (#14794) --- .../common/templates/job/source-build-run-tarball-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 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 60b39b652..b25366774 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 @@ -15,12 +15,12 @@ parameters: fedora36Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36-20220818134137-a09384f ubuntu2004Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-20220813234344-4c008dd poolInternalAmd64: - name: NetCore1ESPool-Svc-Internal + name: NetCore1ESPool-Internal-XL demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 poolInternalArm64: name: Docker-Linux-Arm-Internal poolPublicAmd64: - name: NetCore-Svc-Public + name: NetCore-Public-XL demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open jobs: From 5700aea798f6940ad4a713b0bc3b31bdf6e8efd8 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 20 Oct 2022 08:18:44 -0500 Subject: [PATCH 073/102] Update source-build tarball CI to utilize faster build agents (#14795) --- .../common/templates/job/source-build-run-tarball-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 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 471f00e27..e9891a82c 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 @@ -17,12 +17,12 @@ parameters: fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b poolInternalAmd64: - name: NetCore1ESPool-Svc-Internal + name: NetCore1ESPool-Internal-XL demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 poolInternalArm64: name: Docker-Linux-Arm-Internal poolPublicAmd64: - name: NetCore-Svc-Public + name: NetCore-Public-XL demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open jobs: From a3d39216d2d0ba83154c7a8ccad4acb40a871464 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 22 Sep 2022 15:24:11 -0700 Subject: [PATCH 074/102] Add a prototype telemetry setting test. --- test/EndToEnd/OfficialBuilderTests.cs | 23 ++++++ .../AssemblyInfo.cs | 78 +++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 test/EndToEnd/OfficialBuilderTests.cs create mode 100644 test/Microsoft.DotNet.Tools.Tests.Utilities/AssemblyInfo.cs diff --git a/test/EndToEnd/OfficialBuilderTests.cs b/test/EndToEnd/OfficialBuilderTests.cs new file mode 100644 index 000000000..855c631cd --- /dev/null +++ b/test/EndToEnd/OfficialBuilderTests.cs @@ -0,0 +1,23 @@ +using System; +using System.IO; +using System.Linq; +using System.Reflection; +using System.Xml.Linq; +using FluentAssertions; +using Microsoft.DotNet.TestFramework; +using Microsoft.DotNet.Tools.Test.Utilities; +using Xunit; + +namespace EndToEnd.Tests +{ + public class OfficialBuilderTests : TestBase + { + [Fact] + public void OfficialBuilderAtrribute() + { + var dotnetdir = Path.Combine(Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest), "sdk", "7.0.100-dev"); + var result = AssemblyInfo.Get(Path.Combine(dotnetdir, "dotnet.dll"), "AssemblyMetadataAttribute"); + result.Should().Contain("OfficialBuilder:Microsoft"); + } + } +} diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/AssemblyInfo.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/AssemblyInfo.cs new file mode 100644 index 000000000..f02cfbeb3 --- /dev/null +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/AssemblyInfo.cs @@ -0,0 +1,78 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Reflection.Metadata; +using System.Reflection.PortableExecutable; +using System.Text; + +namespace Microsoft.DotNet.Tools.Test.Utilities +{ + public static class AssemblyInfo + { + public static IList Get(string assemblyPath, string assemblyInfoName) + { + var list = new List(); + + using (var stream = File.OpenRead(assemblyPath)) + using (var peReader = new PEReader(stream)) + { + var metadataReader = peReader.GetMetadataReader(); + var assemblyDefinition = metadataReader.GetAssemblyDefinition(); + + foreach (var handle in assemblyDefinition.GetCustomAttributes()) + { + var attribute = metadataReader.GetCustomAttribute(handle); + var constructor = metadataReader.GetMemberReference((MemberReferenceHandle)attribute.Constructor); + var type = metadataReader.GetTypeReference((TypeReferenceHandle)constructor.Parent); + var name = metadataReader.GetString(type.Name); + + if (name.Equals(assemblyInfoName)) + { + var signature = metadataReader.GetBlobReader(constructor.Signature); + var value = metadataReader.GetBlobReader(attribute.Value); + var header = signature.ReadSignatureHeader(); + + const ushort prolog = 1; // two-byte "prolog" defined by ECMA-335 (II.23.3) to be at the beginning of attribute value blobs + if (value.ReadUInt16() != prolog || header.Kind != SignatureKind.Method || header.IsGeneric) + { + throw new BadImageFormatException(); + } + + var paramCount = signature.ReadCompressedInteger(); + if (paramCount <= 0 || // must have at least 1 parameter + signature.ReadSignatureTypeCode() != SignatureTypeCode.Void) // return type must be void + { + continue; + } + + var sb = new StringBuilder(); + while (paramCount > 0 && sb != null) + { + switch (signature.ReadSignatureTypeCode()) + { + case SignatureTypeCode.String: + sb.Append(value.ReadSerializedString()); + break; + default: + sb = null; + break; + } + + paramCount--; + if (paramCount != 0) + { + sb?.Append(':'); + } + } + + if (sb != null) + { + list.Add(sb.ToString()); + } + } + } + } + return list; + } + } +} From d780b35afac2378f0c8196701b8d46edd6046512 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 11 Oct 2022 13:33:56 -0700 Subject: [PATCH 075/102] Updating the test for the changes in the SDK repo. --- test/EndToEnd/TelemetryOptOutDefaultTests.cs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 test/EndToEnd/TelemetryOptOutDefaultTests.cs diff --git a/test/EndToEnd/TelemetryOptOutDefaultTests.cs b/test/EndToEnd/TelemetryOptOutDefaultTests.cs new file mode 100644 index 000000000..a42f218cb --- /dev/null +++ b/test/EndToEnd/TelemetryOptOutDefaultTests.cs @@ -0,0 +1,18 @@ +using System.IO; +using FluentAssertions; +using Microsoft.DotNet.Tools.Test.Utilities; +using Xunit; + +namespace EndToEnd.Tests +{ + public class TelemetryOptOutDefault : TestBase + { + [Fact] + public void TelemetryOptOutDefaultAttribute() + { + var dotnetdir = Path.Combine(Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest), "sdk", "7.0.100-dev"); + var result = AssemblyInfo.Get(Path.Combine(dotnetdir, "dotnet.dll"), "AssemblyMetadataAttribute"); + result.Should().Contain("TelemetryOptOutDefault:False"); + } + } +} From 5b327454b9793ba3b371af1c0e6ea4444767f6d1 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Fri, 21 Oct 2022 06:16:04 -0700 Subject: [PATCH 076/102] [automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#14807) * Merged PR 25462: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220919.14 - **Date Produced**: September 19, 2022 7:24:58 PM UTC - **Commit**: 020b4fda1c3cf81307d8f13689d63bb3c09c91a8 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.109-servicing.22421.3 to 6.0.110-servicing.22469.14][23] - **Microsoft.NET.Sdk**: [from 6.0.109-servicing.22421.3 to 6.0.110-servicing.22469.14][23] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.9 to 6.0.10][24] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9][24] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9][24] - **Microsoft.NETCore.App.Ref**: [from 6.0.9 to 6.0.10][25] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22463.20][25] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][25] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.9 to 6.0.10][25] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.9 to 6.0.10][25] - **Microsoft.NETCore.Platforms**: [from 6.0.5 to 6.0.6][26] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.9 to 6.0.10][27] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][27] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27] - **dotnet-dev-certs**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27] - **dotnet-user-secrets**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.109 to 6.0.110][28] - **Microsoft.TemplateEngine.Cli**: [from 6.0.109-servicing.22420.11 to 6.0.110-servicing.22464.25][28] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.109 to 6.0.110][28] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][24] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][24] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.9-servicing.22420.4 to 6.0.10-servicing.22456.13][29] - **Microsoft.Build**: [from 17.0.0 to 17.0.1][30] - **NuGet.Build.Tasks**: [from 6.0.2-rc.5 to 6.0.3-rc.1][31] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22463.20][25] [23]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7fffe6d&targetVersion=GC020b4fd&_a=files [24]: https://dev.azure.com/dnceng/inte... * Merged PR 26041: [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.WindowsDesktop.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22464.9 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22464.9 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22463.20 to 6.0.10-servicing.22469.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.110-servicing.22464.25 to 6.0.110-servicing.22470.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.9-servicing.22419.10 to 6.0.10-servicing.22470.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22456... * Merged PR 26213: [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.NETCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.110-servicing.22470.2 to 6.0.110-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (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**: 20220926.22 - **Date Produced**: September 26, 2022 11:14:22 PM UTC - **Commit**: 4041520e714b4334789706bde25e61ff91cf6c2b - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.110-servicing.22470.38 to 6.0.110-servicing.22476.22][1] - **Microsoft.NET.Sdk**: [from 6.0.110-servicing.22470.38 to 6.0.110-servicing.22476.22][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.Platforms**: [from 6.0.6 to 6.0.6][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.110 to 6.0.110][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.110-servicing.22470.2 to 6.0.110-servicing.22476.12][3] - **Microsoft.DotNet.Common.ProjectTemplates.6.0*... * Merged PR 26229: [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.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.110-servicing.22476.12 to 6.0.110-servicing.22476.19 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.110 to 6.0.110 (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**: 20220926.31 - **Date Produced**: September 27, 2022 1:37:52 AM UTC - **Commit**: cb11e73629ffbf6eee418a40fc602ceb752794fa - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.110-servicing.22476.22 to 6.0.110-servicing.22476.31][1] - **Microsoft.NET.Sdk**: [from 6.0.110-servicing.22476.22 to 6.0.110-servicing.22476.31][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.10 to 6.0.10][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **dotnet-dev-certs**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **dotnet-user-secrets**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.110 to 6.0.110][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.110-servicing.22476.12 to 6.0.110-servicing.2247... * Merged PR 26243: [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.WindowsDesktop.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.10-servicing.22470.3 to 6.0.10-servicing.22476.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22470.7 to 6.0.10-servicing.22476.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [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**: 20220926.46 - **Date Produced**: September 27, 2022 3:39:36 AM UTC - **Commit**: a886cd6214c92f6a5d955c056014820c35591e7b - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.110-servicing.22476.31 to 6.0.110-servicing.22476.46][1] - **Microsoft.NET.Sdk**: [from 6.0.110-servicing.22476.31 to 6.0.110-servicing.22476.46][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.10-... * Update source-build tarball CI to utilize faster build agents (#14795) Co-authored-by: dotnet-bot Co-authored-by: DotNet Bot Co-authored-by: Sean Reeser Co-authored-by: Marc Paine Co-authored-by: Matt Mitchell Co-authored-by: Jason Zhai Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Co-authored-by: Michael Simons --- .../common/templates/job/source-build-run-tarball-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 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 13bcd2497..d927b3a86 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 @@ -17,12 +17,12 @@ parameters: fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b poolInternalAmd64: - name: NetCore1ESPool-Svc-Internal + name: NetCore1ESPool-Internal-XL demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 poolInternalArm64: name: Docker-Linux-Arm-Internal poolPublicAmd64: - name: NetCore-Svc-Public + name: NetCore-Public-XL demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open jobs: From 1138045cdde1e5fa2e3f9d46d12ba2edee27e598 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 24 Oct 2022 15:48:03 -0700 Subject: [PATCH 077/102] Update TelemetryOptOutDefaultTests.cs --- test/EndToEnd/TelemetryOptOutDefaultTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/EndToEnd/TelemetryOptOutDefaultTests.cs b/test/EndToEnd/TelemetryOptOutDefaultTests.cs index a42f218cb..1a08d49b0 100644 --- a/test/EndToEnd/TelemetryOptOutDefaultTests.cs +++ b/test/EndToEnd/TelemetryOptOutDefaultTests.cs @@ -10,7 +10,7 @@ namespace EndToEnd.Tests [Fact] public void TelemetryOptOutDefaultAttribute() { - var dotnetdir = Path.Combine(Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest), "sdk", "7.0.100-dev"); + var dotnetdir = Path.Combine(Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest), "sdk", "7.0.100"); var result = AssemblyInfo.Get(Path.Combine(dotnetdir, "dotnet.dll"), "AssemblyMetadataAttribute"); result.Should().Contain("TelemetryOptOutDefault:False"); } From 4f0837a5efce608a0bba49bac56ddfa4b82f5381 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 25 Oct 2022 10:55:35 -0700 Subject: [PATCH 078/102] Remove prior verison of test. --- test/EndToEnd/OfficialBuilderTests.cs | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 test/EndToEnd/OfficialBuilderTests.cs diff --git a/test/EndToEnd/OfficialBuilderTests.cs b/test/EndToEnd/OfficialBuilderTests.cs deleted file mode 100644 index 855c631cd..000000000 --- a/test/EndToEnd/OfficialBuilderTests.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Xml.Linq; -using FluentAssertions; -using Microsoft.DotNet.TestFramework; -using Microsoft.DotNet.Tools.Test.Utilities; -using Xunit; - -namespace EndToEnd.Tests -{ - public class OfficialBuilderTests : TestBase - { - [Fact] - public void OfficialBuilderAtrribute() - { - var dotnetdir = Path.Combine(Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest), "sdk", "7.0.100-dev"); - var result = AssemblyInfo.Get(Path.Combine(dotnetdir, "dotnet.dll"), "AssemblyMetadataAttribute"); - result.Should().Contain("OfficialBuilder:Microsoft"); - } - } -} From 306e6009b3bdb0092a0302485a70c7fbf49024ee Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 25 Oct 2022 10:58:48 -0700 Subject: [PATCH 079/102] Fix to final 3.1 build --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index f98379cb9..580dd9423 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -26,7 +26,7 @@ 30 - $([MSBuild]::Add($(VersionFeature), 20)) + 32 17 From 55f53174febea11bc9f9156b36b6010ec7b417d1 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 25 Oct 2022 14:32:46 -0700 Subject: [PATCH 080/102] Enable codeql --- .vsts-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 7eca85c35..2a9e08d43 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -15,6 +15,8 @@ variables: - name: PostBuildSign value: true - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: Codeql.Enabled + value: true - group: DotNet-DotNetCli-Storage - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines From 319ac0113e7513c635434122e30aa00ba589b3d8 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Wed, 26 Oct 2022 21:24:13 -0700 Subject: [PATCH 081/102] Ensure finalizer only runs when no matching SDK feature bands are installed --- src/finalizer/finalizer.cpp | 17 ++++++-- .../packaging/windows/clisdk/bundle.wxs | 41 ++++++++++++------- 2 files changed, 40 insertions(+), 18 deletions(-) diff --git a/src/finalizer/finalizer.cpp b/src/finalizer/finalizer.cpp index ecb6e1fa9..58bf9e1bd 100644 --- a/src/finalizer/finalizer.cpp +++ b/src/finalizer/finalizer.cpp @@ -396,7 +396,17 @@ extern "C" HRESULT DetectSdk(LPWSTR sczSdkFeatureBandVersion, LPWSTR sczArchitec LogStringLine(REPORT_STANDARD, "Scanning %ls", sczInstalledSdkVersionsKeyName); hr = RegOpen(HKEY_LOCAL_MACHINE, sczInstalledSdkVersionsKeyName, KEY_READ, &hkInstalledSdkVersionsKey); - ExitOnFailure(hr, "Failed to read installed versions key."); + + // When the last SDK is removed the registry key should no longer exist so we can just exit + if (E_FILENOTFOUND == hr) + { + LogStringLine(REPORT_STANDARD, "Registry key not found: %ls.", sczInstalledSdkVersionsKeyName); + hr = S_OK; + *pbInstalled = FALSE; + goto LExit; + } + + ExitOnFailure(hr, "Failed to open registry key: %ls.", sczInstalledSdkVersionsKeyName); for (DWORD dwSdkVersionsValueIndex = 0;; ++dwSdkVersionsValueIndex) { @@ -460,9 +470,10 @@ int wmain(int argc, wchar_t* argv[]) hr = ::DetectSdk(sczFeatureBandVersion, argv[3], &bSdkFeatureBandInstalled); ExitOnFailure(hr, "Failed to detect installed SDKs."); - if (!bSdkFeatureBandInstalled) + // If the feature band is still present, do not remove workloads. + if (bSdkFeatureBandInstalled) { - LogStringLine(REPORT_STANDARD, "SDK with feature band %ls could not be found.", sczFeatureBandVersion); + LogStringLine(REPORT_STANDARD, "Detected SDK with feature band %ls.", sczFeatureBandVersion); goto LExit; } diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index c58c6a194..148487bde 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -151,7 +151,31 @@ - + + + + + @@ -208,20 +232,7 @@ - - + From e1910d8fe01b28d163675c2b1296a45bd3b38e6b Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 27 Oct 2022 09:51:43 -0700 Subject: [PATCH 082/102] Update branding to 7.0.101 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index d393c52c1..886c99742 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 1 - 00 + 01 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) rtm From bf9d4a0e2c27d4297a950ad481267409df8ccfd7 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 27 Oct 2022 13:48:47 -0500 Subject: [PATCH 083/102] Refactor source-build CI triggers and pools (#14835) --- eng/source-build-tarball-build-official.yml | 9 ++++++++- .../job/source-build-create-tarball.yml | 17 +++++++++++++---- .../job/source-build-run-tarball-build.yml | 8 +++++++- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml index a230a4d7c..38753d24d 100644 --- a/eng/source-build-tarball-build-official.yml +++ b/eng/source-build-tarball-build-official.yml @@ -4,7 +4,14 @@ resources: pipelines: - pipeline: installer-build-resource source: dotnet-installer-official-ci - trigger: true + trigger: + branches: + include: + - main + - release/* + - internal/release/* + stages: + - build stages: - stage: build diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index cffdf6bdb..ac6d73016 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -6,11 +6,20 @@ jobs: displayName: Source-Build Create Tarball pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + name: NetCore-Public-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ else }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + name: NetCore1ESPool-Internal-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + ${{ else }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + variables: - name: _BuildConfig value: Release 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 b25366774..8756b1003 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 @@ -15,6 +15,9 @@ parameters: fedora36Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36-20220818134137-a09384f ubuntu2004Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-20220813234344-4c008dd poolInternalAmd64: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + poolInternalAmd64PR: name: NetCore1ESPool-Internal-XL demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 poolInternalArm64: @@ -68,7 +71,10 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ parameters.poolPublicAmd64 }} ${{ if eq(variables['System.TeamProject'], 'internal') }}: - ${{ parameters.poolInternalAmd64 }} + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + ${{ parameters.poolInternalAmd64PR }} + ${{ else }}: + ${{ parameters.poolInternalAmd64 }} - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml From 3079e52002f185db88b0c6a8e8c4c623a5287d19 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 31 Oct 2022 07:10:33 -0700 Subject: [PATCH 084/102] [release/7.0.1xx] Increase dotnet-watch source-build smoke test timeout (#14842) * Up timeout for dotnet-watch smoke test * Add more descriptive timeout message --- .../Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs | 2 +- .../Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs index 46013bbc7..57b4e40b5 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs @@ -24,7 +24,7 @@ public class DotNetWatchTests : SmokeTests workingDirectory: projectDirectory, additionalProcessConfigCallback: processConfigCallback, expectedExitCode: null, // The exit code does not reflect whether or not dotnet watch is working properly - millisecondTimeout: 30000); + millisecondTimeout: 60000); Assert.True(outputChanged); diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs index 62e1eb594..dbaaa8a80 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs @@ -70,7 +70,7 @@ internal static class ExecuteHelper if (!process.HasExited) { - outputHelper.WriteLine($"Killing: {fileName} {args}"); + outputHelper.WriteLine($"Process did not exit. Killing {fileName} {args} after waiting {millisecondTimeout} milliseconds."); process.Kill(true); process.WaitForExit(); } From 3f431162642a98d5d3daea89e3de5cde7b001852 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 1 Nov 2022 10:24:46 -0700 Subject: [PATCH 085/102] Update Versions.props --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 886c99742..f6d5b00c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ 1 01 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - rtm + servicing $(VersionMajor).$(VersionMinor) From 55ad44502451bb39317d2a8a2c1189e7f247f4e1 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Nov 2022 14:17:40 -0700 Subject: [PATCH 086/102] Update branding to 6.0.112 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index f1b28ff88..b5a9289dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 11 + 12 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 8ffa10fe479a2fa97f2f5cae18e955928b09b3f6 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Nov 2022 14:17:44 -0700 Subject: [PATCH 087/102] Update branding to 6.0.307 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b9cd43f20..bc7a5c3a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 06 + 07 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From c7fe18c3f80d4379f3620f5770f6e60b85437e6c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Nov 2022 14:17:48 -0700 Subject: [PATCH 088/102] Update branding to 6.0.404 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 266fd059c..d227a0641 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 03 + 04 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 6e5661babc2e25ce26ec46af95386c0cffee60b5 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 4 Nov 2022 16:50:32 -0700 Subject: [PATCH 089/102] Quick fix to unblock codeflow while I investigate further --- test/EndToEnd/TelemetryOptOutDefaultTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/EndToEnd/TelemetryOptOutDefaultTests.cs b/test/EndToEnd/TelemetryOptOutDefaultTests.cs index 1a08d49b0..b0346c6e5 100644 --- a/test/EndToEnd/TelemetryOptOutDefaultTests.cs +++ b/test/EndToEnd/TelemetryOptOutDefaultTests.cs @@ -10,7 +10,7 @@ namespace EndToEnd.Tests [Fact] public void TelemetryOptOutDefaultAttribute() { - var dotnetdir = Path.Combine(Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest), "sdk", "7.0.100"); + var dotnetdir = Path.Combine(Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest), "sdk", "7.0.101"); var result = AssemblyInfo.Get(Path.Combine(dotnetdir, "dotnet.dll"), "AssemblyMetadataAttribute"); result.Should().Contain("TelemetryOptOutDefault:False"); } From 89758ef046c167369ff3e20f278bbca40cfc6fab Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 4 Nov 2022 22:55:00 -0700 Subject: [PATCH 090/102] Get the telemetry version from the --version command and use it to find dotnet.dll --- test/EndToEnd/TelemetryOptOutDefaultTests.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/EndToEnd/TelemetryOptOutDefaultTests.cs b/test/EndToEnd/TelemetryOptOutDefaultTests.cs index 1a08d49b0..f13724ef0 100644 --- a/test/EndToEnd/TelemetryOptOutDefaultTests.cs +++ b/test/EndToEnd/TelemetryOptOutDefaultTests.cs @@ -10,7 +10,12 @@ namespace EndToEnd.Tests [Fact] public void TelemetryOptOutDefaultAttribute() { - var dotnetdir = Path.Combine(Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest), "sdk", "7.0.100"); + var result = new DotnetCommand() + .ExecuteWithCapturedOutput("--version"); + + var sdkVersion = result.StdOut.Trim(); + + var dotnetdir = Path.Combine(Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest), "sdk", sdkVersion); var result = AssemblyInfo.Get(Path.Combine(dotnetdir, "dotnet.dll"), "AssemblyMetadataAttribute"); result.Should().Contain("TelemetryOptOutDefault:False"); } From ccd4c9b0e2fc08984799c1e7955493f5c4483250 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Sat, 5 Nov 2022 15:13:09 -0700 Subject: [PATCH 091/102] Fix build error. --- test/EndToEnd/TelemetryOptOutDefaultTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/EndToEnd/TelemetryOptOutDefaultTests.cs b/test/EndToEnd/TelemetryOptOutDefaultTests.cs index f13724ef0..caba71157 100644 --- a/test/EndToEnd/TelemetryOptOutDefaultTests.cs +++ b/test/EndToEnd/TelemetryOptOutDefaultTests.cs @@ -10,10 +10,10 @@ namespace EndToEnd.Tests [Fact] public void TelemetryOptOutDefaultAttribute() { - var result = new DotnetCommand() + var versionCommand = new DotnetCommand() .ExecuteWithCapturedOutput("--version"); - var sdkVersion = result.StdOut.Trim(); + var sdkVersion = versionCommand.StdOut.Trim(); var dotnetdir = Path.Combine(Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest), "sdk", sdkVersion); var result = AssemblyInfo.Get(Path.Combine(dotnetdir, "dotnet.dll"), "AssemblyMetadataAttribute"); From 26123078c1388e62f0e4de4855d31cd568af9a4a Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 8 Nov 2022 13:37:42 -0800 Subject: [PATCH 092/102] update global.json and Versions.props for .NET SDK 7.0.100 (#14933) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index f6d5b00c3..2902b1092 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,7 +193,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. --> - 7.0.100-rc.2 + 7.0.100 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 8d9568376..1bf480e4e 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100-rc.2.22477.23" + "dotnet": "7.0.100" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From ec673c7df1fcadb1a25310990894c926e8206974 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Nov 2022 15:47:02 +0000 Subject: [PATCH 093/102] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221031.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.22504.2 -> To Version 7.0.0-alpha.1.22531.3 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8cfdc859..07dbda648 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -201,9 +201,9 @@ https://github.com/dotnet/arcade 02e28316bf35d1028683ee313f0794776bff18d1 - + https://github.com/dotnet/source-build-reference-packages - 8366acfc3e0660ceef6bddbe7794044e5d503521 + 4f5672e90b7f908d96aad61a40b0e9b352518b1c From 24b8e5cb83da633e0c14e73abf4482216804fbec Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 9 Nov 2022 11:04:05 -0600 Subject: [PATCH 094/102] Add infra to specify custom repo nowarns to eliminate patches (#14923) --- .../content/repos/Directory.Build.targets | 6 ++--- .../tarball/content/repos/aspnetcore.proj | 5 ++++ .../tarball/content/repos/razor-compiler.proj | 4 +++ .../0001-Disable-warning-CS0618.patch | 25 ------------------- .../0001-Add-NoWarn-for-NU1507.patch | 25 ------------------- 5 files changed, 12 insertions(+), 53 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-warning-CS0618.patch delete mode 100644 src/SourceBuild/tarball/patches/razor-compiler/0001-Add-NoWarn-for-NU1507.patch diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.targets b/src/SourceBuild/tarball/content/repos/Directory.Build.targets index 9a61647b4..7bf88fdd6 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.targets +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.targets @@ -85,11 +85,11 @@ NewText="/p:RepoRoot="$repo_root/"" /> - + Outputs="$(RepoCompletedSemaphorePath)AddNoWarns.complete" > + CS0618 diff --git a/src/SourceBuild/tarball/content/repos/razor-compiler.proj b/src/SourceBuild/tarball/content/repos/razor-compiler.proj index f47d22c98..a56aa1ea4 100644 --- a/src/SourceBuild/tarball/content/repos/razor-compiler.proj +++ b/src/SourceBuild/tarball/content/repos/razor-compiler.proj @@ -7,6 +7,10 @@ $(ProjectDirectory)global.json $(ProjectDirectory)NuGet.config false + + + NU1507 diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-warning-CS0618.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-warning-CS0618.patch deleted file mode 100644 index c2e2eedf7..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-warning-CS0618.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Thu, 12 May 2022 14:32:59 -0700 -Subject: [PATCH] Disable warning CS0618 - -This is needed because IOperation.Children is deprecated in -Microsoft.CodeAnalysis 4.3.0, but aspnetcore references version 4.2.0. - -Requires https://github.com/dotnet/source-build/issues/2482 in order to eliminate this patch ---- - .../src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj b/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj -index 0b94ad2a8f..1b5cb9d907 100644 ---- a/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj -+++ b/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj -@@ -9,6 +9,7 @@ - false - false - $(MSBuildProjectName).nuspec -+ $(NoWarn);CS0618 - - - diff --git a/src/SourceBuild/tarball/patches/razor-compiler/0001-Add-NoWarn-for-NU1507.patch b/src/SourceBuild/tarball/patches/razor-compiler/0001-Add-NoWarn-for-NU1507.patch deleted file mode 100644 index d1d297915..000000000 --- a/src/SourceBuild/tarball/patches/razor-compiler/0001-Add-NoWarn-for-NU1507.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Fri, 13 May 2022 16:14:14 -0700 -Subject: [PATCH] Add NoWarn for NU1507 - -This warning occurs when using NuGet central package management without defining -any Package Source Mappings. - -Workaround for: https://github.com/dotnet/razor-compiler/issues/242 ---- - Directory.Build.props | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Directory.Build.props b/Directory.Build.props -index a57125f5..019ac376 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -55,6 +55,7 @@ - - $(NoWarn.Replace('1591', '')) - $(NoWarn);0105 -+ $(NoWarn);NU1507 - - - $(WarningsNotAsErrors);CS1591 From c4679427ae635df187e4d250bae4c7bcb58fd611 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 10:00:14 -0800 Subject: [PATCH 095/102] Update dependencies from https://github.com/dotnet/arcade build 20221108.4 (#14943) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22513.4 -> To Version 7.0.0-beta.22558.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8cfdc859..07cdded6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,18 +188,18 @@ - + https://github.com/dotnet/arcade - 02e28316bf35d1028683ee313f0794776bff18d1 + 3f3c360819c5c092d0e4505a67dfe59a33fba557 - + https://github.com/dotnet/arcade - 02e28316bf35d1028683ee313f0794776bff18d1 + 3f3c360819c5c092d0e4505a67dfe59a33fba557 - + https://github.com/dotnet/arcade - 02e28316bf35d1028683ee313f0794776bff18d1 + 3f3c360819c5c092d0e4505a67dfe59a33fba557 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 2902b1092..cd779c9d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.22513.4 + 7.0.0-beta.22558.4 diff --git a/global.json b/global.json index b75566e99..dcb720a56 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100-rc.2.22477.23", + "dotnet": "7.0.100", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22513.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22513.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22558.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22558.4" } } From 08bd29732696b2a10e97af8ef2344df96becb0a1 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Thu, 10 Nov 2022 07:48:49 -0800 Subject: [PATCH 096/102] [automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#14945) * Merged PR 26791: [internal/release/6.0.4xx] 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 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.5 to 6.0.11-servicing.22514.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22476.5 to 6.0.11-servicing.22514.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.402 to 6.0.403 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.402-rtm.22476.21 to 6.0.403-rtm.22512.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.402 to 6.0.403 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.ILLink.Tasks**: from 6.0.200-1.22219.3 to 6.0.200-1.22478.1 (parent: Microsoft.NET.S... * Merged PR 26822: [internal/release/6.0.4xx] 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 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22476.4 to 6.0.11-servicing.22517.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221017.21 - **Date Produced**: October 17, 2022 9:51:49 PM UTC - **Commit**: d149a5642b27a9a972f72c2f3c2bb38b1a0e5783 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22515.2 to 6.0.403-servicing.22517.21][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22515.2 to 6.0.403-servicing.22517.21][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.6][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.10-servicing.22476.4 to 6.0.11-servicing.22517.1][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC3a5d216&targetVersion=GCd149a56&_a=files [2]: https://dev.a... * Merged PR 26841: [internal/release/6.0.4xx] 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.AspNetCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221018.2 - **Date Produced**: October 18, 2022 3:41:02 PM UTC - **Commit**: fc6df7100febe8884eef7ee0e9fa80e8b2b3c5c6 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22517.21 to 6.0.403-servicing.22518.2][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22517.21 to 6.0.403-servicing.22518.2][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCd149a56&targetVersion=GCfc6df71&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCb786d2b&targetVersion=GCcb12e45&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) * Merged PR 26855: [internal/release/6.0.4xx] 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 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22513.6 to 6.0.11-servicing.22517.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22517.1 to 6.0.11-servicing.22517.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221018.24 - **Date Produced**: October 19, 2022 4:48:37 AM UTC - **Commit**: 9a858ac3a005e5984d1d7e51a5e67f0b2c779967 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22518.2 to 6.0.403-servicing.22518.24][5] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22518.2 to 6.0.403-servicing.22518.24][5] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][6] - **VS.Redist.Common.WindowsDesktop.S... * Merged PR 26889: [internal/release/6.0.4xx] 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.AspNetCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221019.6 - **Date Produced**: October 19, 2022 3:07:02 PM UTC - **Commit**: c3805b2afca00eebe5ec3d73753070dc527329ea - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22518.24 to 6.0.403-servicing.22519.6][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22518.24 to 6.0.403-servicing.22519.6][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC9a858ac&targetVersion=GCc3805b2&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCcb12e45&targetVersion=GC1f92829&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) * Merged PR 26910: [internal/release/6.0.4xx] 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 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22519.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22517.6 to 6.0.11-servicing.22519.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221019.21 - **Date Produced**: October 19, 2022 6:59:31 PM UTC - **Commit**: 8a2916d0f10fe3763c3fc577e2aa53dedbef3c4d - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22519.6 to 6.0.403-servicing.22519.21][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22519.6 to 6.0.403-servicing.22519.21][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22519.5][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22517.6 to 6.0.11-servicing.22519.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCc3805b2&targetVersion=GC8a2916d&_a=files [2]: https://dev.a... * Merged PR 26920: [internal/release/6.0.4xx] 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.403 to 6.0.403 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.403-rtm.22512.11 to 6.0.403-rtm.22519.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.403 to 6.0.403 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221019.26 - **Date Produced**: October 19, 2022 7:55:37 PM UTC - **Commit**: ed71b196867c16a91420bcd0609de82131d11ebc - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22519.21 to 6.0.403-servicing.22519.26][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22519.21 to 6.0.403-servicing.22519.26][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.403 to 6.0.403][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.403-rtm.22512.11 to 6.0.403-rtm.22519.12][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.403 to 6.0.403][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC8a2916d&targetVersion=GCed71b19&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC0a0cfeb&targetVersion=GC783938a&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) * Merged PR 26935: [internal/release/6.0.4xx] 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.FSharp.Compiler**: from 12.0.4-beta.22469.1 to 12.0.5-beta.22513.8 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.fsharp**: from 6.0.6-beta.22469.1 to 6.0.7-beta.22513.8 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221019.36 - **Date Produced**: October 19, 2022 10:39:51 PM UTC - **Commit**: 7c0deced9ce8988403320693522a661cdd1c7f70 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22519.26 to 6.0.403-servicing.22519.36][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22519.26 to 6.0.403-servicing.22519.36][1] - **Microsoft.FSharp.Compiler**: [from 12.0.4-beta.22469.1 to 12.0.5-beta.22513.8][2] - **Microsoft.SourceBuild.Intermediate.fsharp**: [from 6.0.6-beta.22469.1 to 6.0.7-beta.22513.8][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCed71b19&targetVersion=GC7c0dece&_a=files [2]: https://github.com/dotnet/fsharp/compare/4438112...5d69143 [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) * Merged PR 26997: [internal/release/6.0.4xx] 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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221023.6 - **Date Produced**: October 23, 2022 10:48:18 PM UTC - **Commit**: 8d1b1fadc14383341698ba47dd871000e3b8f8b6 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22519.36 to 6.0.403-servicing.22523.6][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22519.36 to 6.0.403-servicing.22523.6][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.Platforms**: [from 6.0.7 to 6.0.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7c0dece&targetVersion=GC8d1b1fa&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCaf5b37c&targetVersion=GC943474c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) * Merged PR 27004: [internal/release/6.0.4xx] 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.AspNetCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.403 to 6.0.403 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.403-rtm.22519.12 to 6.0.403-rtm.22523.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.403 to 6.0.403 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221023.16 - **Date Produced**: October 24, 2022 3:29:06 AM UTC - **Commit**: ca02a95e1ba796564bd3dfb1469f5c0ae10b9bda - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22523.6 to 6.0.403-servicing.22523.16][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22523.6 to 6.0.403-servicing.22523.16][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **dotnet-dev-certs**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.403 to 6.0.403][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.403-rtm.22519.12 to 6.0.403-rtm.22523.6][3] - **Microsoft.DotNet.Commo... * Merged PR 27009: [internal/release/6.0.4xx] 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 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22519.2 to 6.0.11-servicing.22523.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20221023.23 - **Date Produced**: October 24, 2022 4:34:27 AM UTC - **Commit**: 6b1e4bc5f9ae0c720255a6accb3fd6654ebe9385 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22523.16 to 6.0.403-servicing.22523.23][1] - **Microsoft.NET.Sdk**: [from 6.0.403-servicing.22523.16 to 6.0.403-servicing.22523.23][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22519.2 to 6.0.11-servicing.22523.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCca02a95&targetVersion=GC6b1e4bc&_a=files [2]: https://dev... * [automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#14911) * Refactor source-build CI triggers and pools (#14835) (#14878) * Update triggers to prevent tarball CI from running on 6.0.3xx and 6.0.4xx (#14896) Co-authored-by: Michael Simons Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Co-authored-by: Jason Zhai * [release/6.0.4xx] Update dependencies from dotnet/arcade (#14935) * Update dependencies from https://github.com/dotnet/arcade build 20221108.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22512.3 -> To Version 6.0.0-beta.22558.2 * Update SourceBuild.Tasks.csproj tfm Co-authored-by: dotnet-maestro[bot] Co-authored-by: MichaelSimons Co-authored-by: dotnet-bot Co-authored-by: Matt Mitchell Co-authored-by: DotNet Bot Co-authored-by: Michael Simons Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Co-authored-by: Jason Zhai Co-authored-by: Sean Reeser Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] --- eng/source-build-tarball-build-official.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml index 38753d24d..5d396baab 100644 --- a/eng/source-build-tarball-build-official.yml +++ b/eng/source-build-tarball-build-official.yml @@ -10,6 +10,11 @@ resources: - main - release/* - internal/release/* + exclude: + - release/6.0.3xx + - internal/release/6.0.3xx + - release/6.0.4xx + - internal/release/6.0.4xx stages: - build From 842d575960fd7977446bc9a7438a952e20213392 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 10 Nov 2022 11:46:39 -0600 Subject: [PATCH 097/102] Update to .NET 7 GA MAUI manifests (#14930) These are the set of .NET 7 GA builds. After `.\build.cmd -pack -publish`, manually tested the workloads: > $env:DOTNET_MULTILEVEL_LOOKUP=0 > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install android --skip-manifest-update Installing pack Microsoft.Android.Sdk.Windows version 33.0.4... ... > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install ios --skip-manifest-update Installing pack Microsoft.iOS.Sdk version 16.0.1478.. ... > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install macos --skip-manifest-update Installing pack Microsoft.macOS.Sdk version 12.3.2372... ... > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install maccatalyst --skip-manifest-update Installing pack Microsoft.MacCatalyst.Sdk version 15.4.2372... ... > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install tvos --skip-manifest-update Installing pack Microsoft.tvOS.Sdk version 16.0.1478... ... > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install maui --skip-manifest-update Installing pack Microsoft.Maui.Core.Ref.android version 7.0.49... --- eng/Versions.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index cd779c9d2..101e5a0a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,13 +197,13 @@ - 7.0.100-rc.1 - 7.0.0-rc.1.6430 - 33.0.0-rc.1.136 - 15.4.1006-rc.1 - 15.4.1006-rc.1 - 12.3.1006-rc.1 - 15.4.1006-rc.1 + 7.0.100 + 7.0.49 + 33.0.4 + 16.0.1478 + 15.4.2372 + 12.3.2372 + 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) 7.0.0-rtm.22504.3 7.0.0-rtm.22504.3 From 604e690d64eed310138d204297c853d9dde4a354 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 11 Nov 2022 14:07:09 -0800 Subject: [PATCH 098/102] Avoid missing signing files in zips (#14966) * Avoid missing signing files in zips * Try again with broader paths to avoid dupes * One more time * Revert unchanged --- eng/Signing.props | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/eng/Signing.props b/eng/Signing.props index 3a2373f9e..0d49f78d1 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -7,12 +7,9 @@ - - - - - - + + + From 8ecb5c08f3e1025f97893bc11e1801dc8ec9a95b Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Fri, 11 Nov 2022 16:20:30 -0800 Subject: [PATCH 099/102] Merging internal commits for release/7.0.1xx (#14931) * use mktemp to correctly use temp files * Merged PR 26816: [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.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.0-rtm.22511.3 to 7.0.0-rtm.22517.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.0-rtm.22511.3 to 7.0.0-rtm.22517.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.0-rtm.22511.4 to 7.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.0-rtm.22511.4 to 7.0.0-rtm.22513.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.0-rtm.22511.4 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.0-rtm.22511.4 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.0-rtm.22511.4 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 7.0.0-rtm.22511.4 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.0-rtm.22512.1 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.0-rtm.22512.1 to 7.0.0-rtm.22517.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.0-rtm.22512.1 to 7.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.0-rtm.22512.1 to 7.0.0-rtm.22517.16 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.0-rtm.22512.1 to 7.0.0-rtm.22517.16 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.0-rtm.22512.1 to 7.0.0-rtm.22517.16 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.0-rtm.22512.1 to 7.0.0-rtm.22517.16 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.0-rtm.22511.7 to 7.0.0-rtm.22517.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.0-rtm.22511.4 to 7.0.0-rtm.22517.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.FSharp.Compiler**: from 12.0.5-beta.22510.6 to 12.4.0-beta.22513.2 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.fsharp**: from 7.0.0-beta.22510.6 to 7.0.0-beta.22513.2 (... * Merged PR 26854: [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.NETCore.App.Ref**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.0-rtm.22513.8 to 7.0.0-rtm.22518.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.0-rtm.22517.16 to 7.0.0-rtm.22518.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.0-rtm.22517.16 to 7.0.0-rtm.22518.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.0-rtm.22517.16 to 7.0.0-rtm.22518.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.0-rtm.22517.16 to 7.0.0-rtm.22518.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.0-rtm.22517.16 to 7.0.0-rtm.22518.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Net.Compilers.Toolset**: from 4.4.0-3.22514.7 to 4.4.0-3.22518.13 (parent: Microsoft.NET.Sdk) - **Microsoft.Build**: from 17.4.0-preview-22512-01 to 17.4.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.0-rtm.22513.8 to 7.0.0-rtm.22518.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.0-rtm.22513.8 to 7.0.0-rtm.22518.5 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221018.28 - **Date Produced**: October 19, 2022 6:19:08 AM UTC - **Commit**: 348f3ff5255a687223425710282e61f16cc19c7b - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][6] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22517.33 to 7.0.100-rtm.22518.28][6] - **Microsoft.... * Merged PR 26890: [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.AspNetCore.App.Ref**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221019.3 - **Date Produced**: October 19, 2022 3:14:47 PM UTC - **Commit**: 149c427f8260d998e3c77012d2da361d649bf573 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22518.37 to 7.0.100-rtm.22519.3][1] - **Microsoft.NET.Sdk**: [from 7.0.100-rtm.22518.37 to 7.0.100-rtm.22519.3][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.100-rtm.22518.37 to 7.0.100-rtm.22519.3][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.0 to 7.0.0][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.0 to 7.0.0][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19][2] - **dotnet-dev-certs**: [from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19][2] - **dotnet-user-jwts**: [from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19][2] - **dotnet-user-secrets**: [from 7.0.0-rtm.22518.10 to 7.0.0-rtm.22518.19][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC8b2d10a&targetVersion=GC149c427&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC2d456a1&targetVersion=GCbb01bbf&_a=files [DependencyUpdate]: <> (End) [marker]: <> (En... * Merged PR 26893: [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**: 20221019.9 - **Date Produced**: October 19, 2022 4:16:20 PM UTC - **Commit**: 8f23e1401dbb16272293b3cbb7af91d3b775bf75 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22519.3 to 7.0.100-rtm.22519.9][1] - **Microsoft.NET.Sdk**: [from 7.0.100-rtm.22519.3 to 7.0.100-rtm.22519.9][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.100-rtm.22519.3 to 7.0.100-rtm.22519.9][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC149c427&targetVersion=GC8f23e14&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) * Merged PR 26897: [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.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22519.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22519.1 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.0-rtm.22517.2 to 7.0.0-rtm.22518.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22518.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221019.13 - **Date Produced**: October 19, 2022 5:31:15 PM UTC - **Commit**: f1a8727d38b1e5f2795ed86ec2692edeaa35b042 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22519.9 to 7.0.100-rtm.22519.13][1] - **Microsoft.NET.Sdk**: [from 7.0.100-rtm.22519.9 to 7.0.100-rtm.22519.13][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.100-rtm.22519.9 to 7.0.100-rtm.22519.13][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.0 to 7.0.0][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22519.1][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22519.1][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.0 to 7.0.0][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.0-rtm.22517.2 to 7.0.0-rtm.22518.7][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.0 to 7.0.0][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22518.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC8f23e14&targetVersion=GCf1a8727&_a=fil... * Merged PR 26919: [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.NET.Test.Sdk**: from 17.4.0-release-20220926-01 to 17.4.0-release-20221019-01 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221019.25 - **Date Produced**: October 19, 2022 7:42:39 PM UTC - **Commit**: 78ffdbba1bc8e26cf13b70618dfe8d51feb18bdd - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22519.13 to 7.0.100-rtm.22519.25][1] - **Microsoft.NET.Sdk**: [from 7.0.100-rtm.22519.13 to 7.0.100-rtm.22519.25][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.100-rtm.22519.13 to 7.0.100-rtm.22519.25][1] - **Microsoft.NET.Test.Sdk**: [from 17.4.0-release-20220926-01 to 17.4.0-release-20221019-01][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCf1a8727&targetVersion=GC78ffdbb&_a=files [2]: https://github.com/microsoft/vstest/compare/576a7cc...c02ece8 [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) * Merged PR 26934: [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.FSharp.Compiler**: from 12.4.0-beta.22513.2 to 12.4.0-beta.22513.10 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.fsharp**: from 7.0.0-beta.22513.2 to 7.0.0-beta.22513.10 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221019.32 - **Date Produced**: October 19, 2022 10:14:41 PM UTC - **Commit**: 513aacc9f9be74ae1a9d33e87e32bbd464bf68ce - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22519.25 to 7.0.100-rtm.22519.32][1] - **Microsoft.NET.Sdk**: [from 7.0.100-rtm.22519.25 to 7.0.100-rtm.22519.32][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.100-rtm.22519.25 to 7.0.100-rtm.22519.32][1] - **Microsoft.FSharp.Compiler**: [from 12.4.0-beta.22513.2 to 12.4.0-beta.22513.10][2] - **Microsoft.SourceBuild.Intermediate.fsharp**: [from 7.0.0-beta.22513.2 to 7.0.0-beta.22513.10][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC78ffdbb&targetVersion=GC513aacc&_a=files [2]: https://github.com/dotnet/fsharp/compare/e142005...c370ee0 [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) * Merged PR 26943: [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**: 20221019.39 - **Date Produced**: October 20, 2022 1:19:35 AM UTC - **Commit**: 6efaab2a54c46522d3241c0bf64df9e67e35cc9b - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22519.32 to 7.0.100-rtm.22519.39][1] - **Microsoft.NET.Sdk**: [from 7.0.100-rtm.22519.32 to 7.0.100-rtm.22519.39][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.100-rtm.22519.32 to 7.0.100-rtm.22519.39][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC513aacc&targetVersion=GC6efaab2&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) * Merged PR 26944: [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.Net.Compilers.Toolset**: from 4.4.0-3.22518.13 to 4.4.0-4.22519.21 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221019.46 - **Date Produced**: October 20, 2022 6:38:33 AM UTC - **Commit**: 962460f12e44a2931544e5ec1c55d9ea99b99f21 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22519.39 to 7.0.100-rtm.22519.46][1] - **Microsoft.NET.Sdk**: [from 7.0.100-rtm.22519.39 to 7.0.100-rtm.22519.46][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.100-rtm.22519.39 to 7.0.100-rtm.22519.46][1] - **Microsoft.Net.Compilers.Toolset**: [from 4.4.0-3.22518.13 to 4.4.0-4.22519.21][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC6efaab2&targetVersion=GC962460f&_a=files [2]: https://github.com/dotnet/roslyn/compare/7856a68...df3e083 [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221020.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100 -> To Version 7.0.100 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221021.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100 -> To Version 7.0.100 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.4.0-4.22519.21 -> To Version 4.4.0-4.22520.11 (parent: Microsoft.NET.Sdk * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221021.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100 -> To Version 7.0.100 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.4.0-4.22519.21 -> To Version 4.4.0-4.22520.11 (parent: Microsoft.NET.Sdk Co-authored-by: Noah Gilson Co-authored-by: dotnet-bot Co-authored-by: DotNet Bot --- NuGet.config | 34 +++- eng/Version.Details.xml | 180 +++++++++--------- eng/Versions.props | 48 ++--- .../job/source-build-run-tarball-build.yml | 17 +- ...solvePackageFileConflicts-workaround.patch | 23 +++ 5 files changed, 177 insertions(+), 125 deletions(-) create mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch diff --git a/NuGet.config b/NuGet.config index 6d004c295..1ebc99984 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,8 +6,30 @@ + + + + + + + + + + + + + + + + + + + + - + + + @@ -29,9 +51,19 @@ + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07cdded6f..1ca695c75 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,45 +2,45 @@ - https://github.com/dotnet/windowsdesktop - 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 417429fc040af552532bb07aad29e5e8639b840f - - https://github.com/dotnet/windowsdesktop - 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 417429fc040af552532bb07aad29e5e8639b840f - - https://github.com/dotnet/windowsdesktop - 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 417429fc040af552532bb07aad29e5e8639b840f - https://github.com/dotnet/windowsdesktop - 8a6506751c4e473fb277dd81df3c8ace41a1dfa7 + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 417429fc040af552532bb07aad29e5e8639b840f - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + bb01bbf4433e27289b99001b7de6a582879d1835 - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 - - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + bb01bbf4433e27289b99001b7de6a582879d1835 - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + bb01bbf4433e27289b99001b7de6a582879d1835 - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + bb01bbf4433e27289b99001b7de6a582879d1835 - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + bb01bbf4433e27289b99001b7de6a582879d1835 - - https://github.com/dotnet/aspnetcore - c6865355c01e1fb170b65427846d939559ab3789 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + bb01bbf4433e27289b99001b7de6a582879d1835 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + bb01bbf4433e27289b99001b7de6a582879d1835 https://github.com/dotnet/test-templates @@ -98,44 +98,44 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - - https://github.com/dotnet/sdk - 6772efe6f359786e0350c0f15638d0475c95cba4 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 882a576873b701f79d6584e4a0cf84036fdcd83f - - https://github.com/dotnet/sdk - 6772efe6f359786e0350c0f15638d0475c95cba4 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 882a576873b701f79d6584e4a0cf84036fdcd83f - - https://github.com/dotnet/sdk - 6772efe6f359786e0350c0f15638d0475c95cba4 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 882a576873b701f79d6584e4a0cf84036fdcd83f - - https://github.com/dotnet/sdk - 6772efe6f359786e0350c0f15638d0475c95cba4 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 882a576873b701f79d6584e4a0cf84036fdcd83f - - https://github.com/dotnet/winforms - 631f7cf4c165b3a3da5ab8f8e974a00c0bf067d7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms + e83409daa530605da4eb5f847c6740a520325d25 - - https://github.com/dotnet/wpf - fd949cc0bee03dece87b7430fbba99f150632b9d + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 5bdd01cf158a4b214f11025fdd45ac7e4774509f + c370ee09c2eebcc750a59e9c10e52792679f896e - + https://github.com/dotnet/fsharp - 5bdd01cf158a4b214f11025fdd45ac7e4774509f + c370ee09c2eebcc750a59e9c10e52792679f896e - + https://github.com/microsoft/vstest - 576a7cc1b259976393cf576a6a9c5df967bb2b7d + c02ece877c62577810f893c44279ce79af820112 @@ -144,32 +144,32 @@ linker - + https://github.com/dotnet/roslyn - a9c49e8b8633005d2d03516693950037a9cf7cc7 + 9e075f038a19d493244bc18997fc52a6c6eefa72 - + https://github.com/dotnet/msbuild - 9e6f1455a81e01cb7780f1e8ed5041f20cd396a3 - + 18d5aef85920037c9d6ff49b1215a4daf515197f + - + https://github.com/nuget/nuget.client - 1a082949ae5b6da7ca2cce047396c53ae1afdde7 + 125f673fd1cdb3cc012f62aa3ce764d2460b89eb https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - daca2015ce74956591df9c9dc7ee732af7863b42 + 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 - + https://github.com/dotnet/emsdk - daca2015ce74956591df9c9dc7ee732af7863b42 + 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 https://github.com/dotnet/deployment-tools @@ -201,9 +201,9 @@ https://github.com/dotnet/arcade 3f3c360819c5c092d0e4505a67dfe59a33fba557 - + https://github.com/dotnet/source-build-reference-packages - 8366acfc3e0660ceef6bddbe7794044e5d503521 + fb2dd1b6d4b8809014d2f91e645b683b718419fa diff --git a/eng/Versions.props b/eng/Versions.props index 101e5a0a7..31db48967 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22511.7 + 7.0.0-rtm.22518.7 - 7.0.0-rtm.22511.4 + 7.0.0-rtm.22518.2 @@ -50,44 +50,44 @@ - 7.0.0-rtm.22512.1 - 7.0.0-rtm.22512.1 - 7.0.0-rtm.22512.1 - 7.0.0-rtm.22512.1 - 7.0.0-rtm.22512.1 - 7.0.0-rtm.22512.1 - 7.0.0-rtm.22512.1 + 7.0.0 + 7.0.0 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 0.2.0 - 7.0.100-rtm.22512.19 - 7.0.100-rtm.22512.19 - 7.0.100-rtm.22512.19 + 7.0.100 + 7.0.100-rtm.22521.7 + 7.0.100-rtm.22521.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rtm.22511.4 + 7.0.0 - 7.0.0-rtm.22511.4 - 7.0.0-rtm.22511.4 - 7.0.0-rtm.22511.4 - 7.0.0-rtm.22511.4 - 7.0.0-rtm.22511.4 - 7.0.0-rtm.22511.4 + 7.0.0-rtm.22518.5 + 7.0.0-rtm.22518.5 + 7.0.0 + 7.0.0 + 7.0.0 + 7.0.0 2.1.0 - 7.0.0-rtm.22511.3 - 7.0.0-rtm.22511.3 + 7.0.0-rtm.22519.1 + 7.0.0-rtm.22519.1 7.0.0 7.0.0 @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.4.0-release-20220926-01 + 17.4.0-release-20221019-01 @@ -205,8 +205,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-rtm.22504.3 - 7.0.0-rtm.22504.3 + 7.0.0 + 7.0.0 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) 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 8756b1003..06bfd2b15 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 @@ -76,22 +76,19 @@ jobs: ${{ else }}: ${{ parameters.poolInternalAmd64 }} -- ${{ if eq(variables['System.TeamProject'], 'internal') }}: +- ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: architecture: arm64 dependsOn: ${{ parameters.dependsOn }} - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - excludeSdkContentTests: true installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - Debian11-Offline: - _BootstrapPrep: true - _Container: ${{ parameters.debian11Arm64Container }} - _EnablePoison: false - _ExcludeOmniSharpTests: false - _RunOnline: false + Debian11-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.debian11Arm64Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _RunOnline: false name: Build_Tarball_arm64 pool: ${{ parameters.poolInternalArm64 }} diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch new file mode 100644 index 000000000..ab355630e --- /dev/null +++ b/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Fri, 11 Nov 2022 21:10:54 +0000 +Subject: [PATCH] ResolvePackageFileConflicts workaround + +--- + .../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +index 3b5d2ae950..f92fb421fe 100644 +--- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj ++++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +@@ -253,6 +253,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant + + + ++ ++ ++ + + + From ea694946419ab054c683a16228a41f62da5e27d1 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Sat, 12 Nov 2022 09:00:12 -0800 Subject: [PATCH 100/102] Fix missing cross-genning (#14967) * Fix missing cross-genning Cross-genning got missed because the paths were hardcoded. Instead, use properties and a "default TFM". Also introduce checking to ensure that we don't miss cross-genning in common cases. * Don't error when no WD found --- src/redist/targets/Crossgen.targets | 57 +++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 11 deletions(-) diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index da7d186a1..399529689 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -29,7 +29,27 @@ BuildInParallel="False" Projects="@(CrossGenDownloadPackageProject)"> - + + + + net7.0 + + $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk\tools\$(DefaultToolTfm)\ + $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.BlazorWebAssembly\tools\$(DefaultToolTfm)\ + $(SdkOutputDirectory)Sdks\NuGet.Build.Tasks.Pack\CoreCLR\ + $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Razor\tasks\$(DefaultToolTfm)\ + $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.WindowsDesktop\tools\$(DefaultToolTfm)\ + $(SdkOutputDirectory)Sdks\Microsoft.NET.ILLink.Tasks\tools\$(DefaultToolTfm)\ + $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Publish\tools\$(DefaultToolTfm)\ + $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Web\tools\$(DefaultToolTfm)\ + $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Web.ProjectSystem\tools\$(DefaultToolTfm)\ + $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Worker\tools\$(DefaultToolTfm)\ + + @@ -49,16 +69,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -121,6 +141,21 @@ false + + + + + + + + + + + + + + + Date: Mon, 14 Nov 2022 10:50:01 -0800 Subject: [PATCH 101/102] Update asp.net templates (#14958) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 31db48967..7ec454572 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -135,7 +135,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) - 6.0.10 + 6.0.11 $(MicrosoftWinFormsProjectTemplates50PackageVersion) $(MicrosoftWPFProjectTemplates50PackageVersion) @@ -150,7 +150,7 @@ 3.1.27 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.30 + 3.1.31 3.2.1 4.8.0-rc2.19462.10 From 8bfe390861dc6dd4a06105950cd513416a5eceab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Nov 2022 13:05:10 -0800 Subject: [PATCH 102/102] Update dependencies from https://github.com/dotnet/arcade build 20221111.2 (#14983) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22558.4 -> To Version 7.0.0-beta.22561.2 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 21 --------------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 4 files changed, 9 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1ebc99984..770df6dcb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,29 +7,16 @@ - - - - - - - - - - - - - @@ -51,19 +38,11 @@ - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c67dca18..cb5497dc5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,18 +188,18 @@ - + https://github.com/dotnet/arcade - 3f3c360819c5c092d0e4505a67dfe59a33fba557 + f36ea231c234560514ede4c2747897a737ced28f - + https://github.com/dotnet/arcade - 3f3c360819c5c092d0e4505a67dfe59a33fba557 + f36ea231c234560514ede4c2747897a737ced28f - + https://github.com/dotnet/arcade - 3f3c360819c5c092d0e4505a67dfe59a33fba557 + f36ea231c234560514ede4c2747897a737ced28f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 7ec454572..aabb8f052 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.22558.4 + 7.0.0-beta.22561.2 diff --git a/global.json b/global.json index dcb720a56..7cd0b9917 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22558.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22558.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22561.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22561.2" } }