From 8e988a54c3502c51171cdea2b6afb614dd2373f2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 30 Mar 2024 01:44:43 +0000 Subject: [PATCH 01/13] [main] Rebootstrap with latest changes (#19145) Co-authored-by: Nikola Milosavljevic --- .../content/eng/Version.Details.xml | 4 +- src/SourceBuild/content/eng/Versions.props | 4 +- src/SourceBuild/content/global.json | 4 +- .../arcade/0002-Disable-CA2022-error.patch | 25 ++++++++++++ .../0001-Disable-CA2022-errors.patch | 39 +++++++++++++++++++ .../sdk/0001-Disable-CA2022-errors.patch | 39 +++++++++++++++++++ .../vstest/0001-Disable-CA2022-errors.patch | 25 ++++++++++++ .../xdt/0001-Disable-CA2022-error.patch | 24 ++++++++++++ 8 files changed, 158 insertions(+), 6 deletions(-) create mode 100644 src/SourceBuild/patches/arcade/0002-Disable-CA2022-error.patch create mode 100644 src/SourceBuild/patches/nuget-client/0001-Disable-CA2022-errors.patch create mode 100644 src/SourceBuild/patches/sdk/0001-Disable-CA2022-errors.patch create mode 100644 src/SourceBuild/patches/vstest/0001-Disable-CA2022-errors.patch create mode 100644 src/SourceBuild/patches/xdt/0001-Disable-CA2022-error.patch diff --git a/src/SourceBuild/content/eng/Version.Details.xml b/src/SourceBuild/content/eng/Version.Details.xml index 94046ba35..21ca8804d 100644 --- a/src/SourceBuild/content/eng/Version.Details.xml +++ b/src/SourceBuild/content/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 2fb543a45580400a559b5ae41c96a815ea14dac5 + 689fb2d1b620a9df28c3384d9b208e3654a0f928 diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 3bf1c64c9..74c73d7fb 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -22,8 +22,8 @@ of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 9.0.100-preview.2.24104.1 - 9.0.100-preview.2.24104.1 + 9.0.100-preview.4.24179.1 + 9.0.100-preview.4.24179.1 15.7.179 diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index 593a57a50..5ffcf53ed 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.100-preview.2.24103.2" + "dotnet": "9.0.100-preview.4.24178.10" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24102.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24177.2" } } diff --git a/src/SourceBuild/patches/arcade/0002-Disable-CA2022-error.patch b/src/SourceBuild/patches/arcade/0002-Disable-CA2022-error.patch new file mode 100644 index 000000000..ca717d5fc --- /dev/null +++ b/src/SourceBuild/patches/arcade/0002-Disable-CA2022-error.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nikola Milosavljevic +Date: Fri, 29 Mar 2024 16:33:22 +0000 +Subject: [PATCH] Disable CA2022 error + +Backport: https://github.com/dotnet/arcade/issues/14668 +--- + src/SignCheck/Microsoft.SignCheck/Verification/LZMAUtils.cs | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/SignCheck/Microsoft.SignCheck/Verification/LZMAUtils.cs b/src/SignCheck/Microsoft.SignCheck/Verification/LZMAUtils.cs +index 764a87fa6..e20f70ff4 100644 +--- a/src/SignCheck/Microsoft.SignCheck/Verification/LZMAUtils.cs ++++ b/src/SignCheck/Microsoft.SignCheck/Verification/LZMAUtils.cs +@@ -30,8 +30,10 @@ public static void Decompress(string sourceFile, string destinationFile) + byte[] properties = new byte[5]; + byte[] fileLengthBytes = new byte[8]; + ++#pragma warning disable CA2022 // Avoid inexact read + inFile.Read(properties, 0, 5); + inFile.Read(fileLengthBytes, 0, 8); ++#pragma warning restore CA2022 + + long fileLength = BitConverter.ToInt64(fileLengthBytes, 0); + decoder.SetDecoderProperties(properties); diff --git a/src/SourceBuild/patches/nuget-client/0001-Disable-CA2022-errors.patch b/src/SourceBuild/patches/nuget-client/0001-Disable-CA2022-errors.patch new file mode 100644 index 000000000..99782bd5f --- /dev/null +++ b/src/SourceBuild/patches/nuget-client/0001-Disable-CA2022-errors.patch @@ -0,0 +1,39 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nikola Milosavljevic +Date: Sat, 30 Mar 2024 00:25:18 +0000 +Subject: [PATCH] Disable CA2022 errors + +Backport: https://github.com/NuGet/Home/issues/13361 +--- + .../Signing/Archive/SignedPackageArchiveUtility.cs | 2 ++ + src/NuGet.Core/NuGet.ProjectModel/Utf8JsonStreamReader.cs | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/NuGet.Core/NuGet.Packaging/Signing/Archive/SignedPackageArchiveUtility.cs b/src/NuGet.Core/NuGet.Packaging/Signing/Archive/SignedPackageArchiveUtility.cs +index 44f3dbdc2..0d133441d 100644 +--- a/src/NuGet.Core/NuGet.Packaging/Signing/Archive/SignedPackageArchiveUtility.cs ++++ b/src/NuGet.Core/NuGet.Packaging/Signing/Archive/SignedPackageArchiveUtility.cs +@@ -104,7 +104,9 @@ public static Stream OpenPackageSignatureFileStream(BinaryReader reader) + var buffer = new byte[localFileHeader.UncompressedSize]; + + reader.BaseStream.Seek(offsetToData, SeekOrigin.Begin); ++#pragma warning disable CA2022 // Avoid inexact read + reader.BaseStream.Read(buffer, offset: 0, count: buffer.Length); ++#pragma warning restore CA2022 + + return new MemoryStream(buffer, writable: false); + } +diff --git a/src/NuGet.Core/NuGet.ProjectModel/Utf8JsonStreamReader.cs b/src/NuGet.Core/NuGet.ProjectModel/Utf8JsonStreamReader.cs +index e92a2dc0c..0fb6b35f4 100644 +--- a/src/NuGet.Core/NuGet.ProjectModel/Utf8JsonStreamReader.cs ++++ b/src/NuGet.Core/NuGet.ProjectModel/Utf8JsonStreamReader.cs +@@ -52,7 +52,9 @@ internal Utf8JsonStreamReader(Stream stream, int bufferSize = BufferSizeDefault, + _buffer = _bufferPool.Rent(bufferSize); + _disposed = false; + _stream = stream; ++#pragma warning disable CA2022 // Avoid inexact read + _stream.Read(_buffer, 0, 3); ++#pragma warning restore CA2022 + if (!Utf8Bom.AsSpan().SequenceEqual(_buffer.AsSpan(0, 3))) + { + _bufferUsed = 3; diff --git a/src/SourceBuild/patches/sdk/0001-Disable-CA2022-errors.patch b/src/SourceBuild/patches/sdk/0001-Disable-CA2022-errors.patch new file mode 100644 index 000000000..4f4de8d56 --- /dev/null +++ b/src/SourceBuild/patches/sdk/0001-Disable-CA2022-errors.patch @@ -0,0 +1,39 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nikola Milosavljevic +Date: Fri, 29 Mar 2024 19:48:28 +0000 +Subject: [PATCH] Disable CA2022 errors + +Backport: https://github.com/dotnet/sdk/issues/39893 +--- + src/RazorSdk/Tool/Client.cs | 2 ++ + src/RazorSdk/Tool/ConnectionHost.cs | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/RazorSdk/Tool/Client.cs b/src/RazorSdk/Tool/Client.cs +index 3a0436aa8b..54c89bf8d6 100644 +--- a/src/RazorSdk/Tool/Client.cs ++++ b/src/RazorSdk/Tool/Client.cs +@@ -169,7 +169,9 @@ public override async Task WaitForDisconnectAsync(CancellationToken cancellation + try + { + ServerLogger.Log($"Before poking pipe {Identifier}."); ++#pragma warning disable CA2022 // Avoid inexact read + await Stream.ReadAsync(Array.Empty(), 0, 0, cancellationToken); ++#pragma warning restore CA2022 + ServerLogger.Log($"After poking pipe {Identifier}."); + } + catch (OperationCanceledException) +diff --git a/src/RazorSdk/Tool/ConnectionHost.cs b/src/RazorSdk/Tool/ConnectionHost.cs +index d1c557dea9..f92397d6e9 100644 +--- a/src/RazorSdk/Tool/ConnectionHost.cs ++++ b/src/RazorSdk/Tool/ConnectionHost.cs +@@ -107,7 +107,9 @@ public override async Task WaitForDisconnectAsync(CancellationToken cancellation + try + { + ServerLogger.Log($"Before poking pipe {Identifier}."); ++#pragma warning disable CA2022 // Avoid inexact read + await Stream.ReadAsync(Array.Empty(), 0, 0, cancellationToken); ++#pragma warning restore CA2022 + ServerLogger.Log($"After poking pipe {Identifier}."); + } + catch (OperationCanceledException) diff --git a/src/SourceBuild/patches/vstest/0001-Disable-CA2022-errors.patch b/src/SourceBuild/patches/vstest/0001-Disable-CA2022-errors.patch new file mode 100644 index 000000000..33248b7f8 --- /dev/null +++ b/src/SourceBuild/patches/vstest/0001-Disable-CA2022-errors.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nikola Milosavljevic +Date: Fri, 29 Mar 2024 18:27:34 +0000 +Subject: [PATCH] Disable CA2022 errors + +Backport: https://github.com/microsoft/vstest/issues/4955 +--- + .../Helpers/DotnetHostHelper.cs | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/DotnetHostHelper.cs b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/DotnetHostHelper.cs +index 519ee3441..3f8192014 100644 +--- a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/DotnetHostHelper.cs ++++ b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/DotnetHostHelper.cs +@@ -409,8 +409,10 @@ public class DotnetHostHelper : IDotnetHostHelper + using var headerReader = _fileHelper.GetStream(path, FileMode.Open, FileAccess.Read); + var magicBytes = new byte[4]; + var cpuInfoBytes = new byte[4]; ++#pragma warning disable CA2022 // Avoid inexact read + headerReader.Read(magicBytes, 0, magicBytes.Length); + headerReader.Read(cpuInfoBytes, 0, cpuInfoBytes.Length); ++#pragma warning restore CA2022 + + var magic = BitConverter.ToUInt32(magicBytes, 0); + var cpuInfo = BitConverter.ToUInt32(cpuInfoBytes, 0); diff --git a/src/SourceBuild/patches/xdt/0001-Disable-CA2022-error.patch b/src/SourceBuild/patches/xdt/0001-Disable-CA2022-error.patch new file mode 100644 index 000000000..5b93a52cb --- /dev/null +++ b/src/SourceBuild/patches/xdt/0001-Disable-CA2022-error.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nikola Milosavljevic +Date: Fri, 29 Mar 2024 18:22:05 +0000 +Subject: [PATCH] Disable CA2022 error + +Backport: https://github.com/dotnet/xdt/issues/583 +--- + src/Microsoft.Web.XmlTransform/XmlFileInfoDocument.cs | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/Microsoft.Web.XmlTransform/XmlFileInfoDocument.cs b/src/Microsoft.Web.XmlTransform/XmlFileInfoDocument.cs +index 5c884d7..1e86c48 100644 +--- a/src/Microsoft.Web.XmlTransform/XmlFileInfoDocument.cs ++++ b/src/Microsoft.Web.XmlTransform/XmlFileInfoDocument.cs +@@ -90,7 +90,9 @@ public class XmlFileInfoDocument : XmlDocument, IDisposable + Encoding encoding = null; + if (stream.CanSeek) { + byte[] buffer = new byte[3]; ++#pragma warning disable CA2022 // Avoid inexact read + stream.Read(buffer, 0, buffer.Length); ++#pragma warning restore CA2022 + + if (buffer[0] == 0xEF && buffer[1] == 0xBB && buffer[2] == 0xBF) + encoding = Encoding.UTF8; From a4f065da1ada2b72bde28d9083d4ae99a9f25668 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 30 Mar 2024 10:05:15 +0100 Subject: [PATCH 02/13] [main] Update dependencies from dotnet/arcade (#19242) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 2 +- .../job/publish-build-assets.yml | 4 ++-- .../post-build/post-build.yml | 4 ++-- global.json | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a904a75e..38658cc23 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -243,17 +243,17 @@ - + https://github.com/dotnet/arcade - 689fb2d1b620a9df28c3384d9b208e3654a0f928 + 4345e14684eab24fa2f8217706756dd7c0787d84 - + https://github.com/dotnet/arcade - 689fb2d1b620a9df28c3384d9b208e3654a0f928 + 4345e14684eab24fa2f8217706756dd7c0787d84 - + https://github.com/dotnet/arcade - 689fb2d1b620a9df28c3384d9b208e3654a0f928 + 4345e14684eab24fa2f8217706756dd7c0787d84 https://github.com/dotnet/arcade-services @@ -263,14 +263,14 @@ https://github.com/dotnet/arcade-services 0e9abfee048404d9b994fc64235b42216ce68dad - + https://github.com/dotnet/arcade - 689fb2d1b620a9df28c3384d9b208e3654a0f928 + 4345e14684eab24fa2f8217706756dd7c0787d84 - + https://github.com/dotnet/arcade - 689fb2d1b620a9df28c3384d9b208e3654a0f928 + 4345e14684eab24fa2f8217706756dd7c0787d84 diff --git a/eng/Versions.props b/eng/Versions.props index 6490a6a82..69f66cfc3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.24177.2 + 9.0.0-beta.24178.6 diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index d72e4ea6d..38340d3e3 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -60,8 +60,8 @@ jobs: os: windows # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + name: NetCore1ESPool-Publishing-Internal + image: windows.vs2019.amd64 os: windows steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index 5c98fe1c0..d286e956b 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -261,8 +261,8 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + name: NetCore1ESPool-Publishing-Internal + image: windows.vs2019.amd64 os: windows steps: - template: setup-maestro-vars.yml diff --git a/global.json b/global.json index 90bced43b..af5d294f0 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24177.2", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24177.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24178.6", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24178.6" } } From 847e77f3006441f488ad4580852dbbf9632ce6a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 30 Mar 2024 09:05:33 +0000 Subject: [PATCH 03/13] [main] Update dependencies from dotnet/sdk (#19240) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 9.0.0-preview.4.24178.2 to 9.0.0-preview.4.24178.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0: from 9.0.0-preview.4.24178.2 to 9.0.0-preview.4.24178.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0: from 9.0.0-preview.4.24178.2 to 9.0.0-preview.4.24178.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-preview.4.24178.3 to 9.0.0-preview.4.24178.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 9.0.0-preview.4.24178.3 to 9.0.0-preview.4.24178.9 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.9.0: from 9.0.0-preview.4.24178.3 to 9.0.0-preview.4.24178.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 9.0.0-preview.4.24178.3 to 9.0.0-preview.4.24178.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 9.0.0-preview.4.24178.3 to 9.0.0-preview.4.24178.9 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.runtime.linux-x64: from 9.0.0-preview.4.24178.3 to 9.0.0-preview.4.24178.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 9.0.0-preview.4.24177.3 to 9.0.0-preview.4.24179.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 9.0.0-preview.4.24177.3 to 9.0.0-preview.4.24179.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-preview.4.24177.3 to 9.0.0-preview.4.24179.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-preview.4.24177.3 to 9.0.0-preview.4.24179.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 9.0.0-preview.4.24177.3 to 9.0.0-preview.4.24179.1 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 9.0.0-preview.4.24177.3 to 9.0.0-preview.4.24179.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 9.0.0-preview.4.24177.3 to 9.0.0-preview.4.24179.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.aspnetcore: from 9.0.0-preview.4.24177.3 to 9.0.0-preview.4.24179.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-preview.4.24178.2 to 9.0.0-preview.4.24178.3 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-preview.4.24178.2 to 9.0.0-preview.4.24178.3 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 9.0.0-preview.4.24177.5 to 9.0.0-preview.4.24178.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.NET.ILLink.Tasks: from 9.0.0-preview.4.24178.3 to 9.0.0-preview.4.24178.9 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.11.0-1.24177.10 to 4.11.0-1.24178.11 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.roslyn: from 4.11.0-1.24177.10 to 4.11.0-1.24178.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-preview.4.24178.3 to 9.0.0-preview.4.24178.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-preview.4.24178.3 to 9.0.0-preview.4.24178.9 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 112 ++++++++++++++++++++-------------------- eng/Versions.props | 44 ++++++++-------- 2 files changed, 78 insertions(+), 78 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38658cc23..a70d8eec8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,41 +5,41 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 779fc998f3d71a33a0ed59b4acf849b45e9659a2 + 73ab0ac1e04fcf7d16a6c1d35fd43a8b46c40a2e - + https://github.com/dotnet/windowsdesktop - 779fc998f3d71a33a0ed59b4acf849b45e9659a2 + 73ab0ac1e04fcf7d16a6c1d35fd43a8b46c40a2e - + https://github.com/dotnet/windowsdesktop - 779fc998f3d71a33a0ed59b4acf849b45e9659a2 + 73ab0ac1e04fcf7d16a6c1d35fd43a8b46c40a2e - + https://github.com/dotnet/windowsdesktop - 779fc998f3d71a33a0ed59b4acf849b45e9659a2 + 73ab0ac1e04fcf7d16a6c1d35fd43a8b46c40a2e - + https://github.com/dotnet/runtime - e612bf4d0b6f08623092902c34a504e932388664 + 83b0d939bedadf7d782b0b26307c2d8c1d5b76f4 - + https://github.com/dotnet/runtime - e612bf4d0b6f08623092902c34a504e932388664 + 83b0d939bedadf7d782b0b26307c2d8c1d5b76f4 - + https://github.com/dotnet/runtime - e612bf4d0b6f08623092902c34a504e932388664 + 83b0d939bedadf7d782b0b26307c2d8c1d5b76f4 - + https://github.com/dotnet/runtime - e612bf4d0b6f08623092902c34a504e932388664 + 83b0d939bedadf7d782b0b26307c2d8c1d5b76f4 - + https://github.com/dotnet/runtime - e612bf4d0b6f08623092902c34a504e932388664 + 83b0d939bedadf7d782b0b26307c2d8c1d5b76f4 @@ -47,70 +47,70 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - e612bf4d0b6f08623092902c34a504e932388664 + 83b0d939bedadf7d782b0b26307c2d8c1d5b76f4 - + https://github.com/dotnet/runtime - e612bf4d0b6f08623092902c34a504e932388664 + 83b0d939bedadf7d782b0b26307c2d8c1d5b76f4 - + https://github.com/dotnet/aspnetcore - 1c8f20be1fc4e97044d7ca93edae3af528bc3521 + 57ede89c3f7139e402ffbe52923bad19416014a7 - + https://github.com/dotnet/aspnetcore - 1c8f20be1fc4e97044d7ca93edae3af528bc3521 + 57ede89c3f7139e402ffbe52923bad19416014a7 - + https://github.com/dotnet/aspnetcore - 1c8f20be1fc4e97044d7ca93edae3af528bc3521 + 57ede89c3f7139e402ffbe52923bad19416014a7 - + https://github.com/dotnet/aspnetcore - 1c8f20be1fc4e97044d7ca93edae3af528bc3521 + 57ede89c3f7139e402ffbe52923bad19416014a7 - + https://github.com/dotnet/aspnetcore - 1c8f20be1fc4e97044d7ca93edae3af528bc3521 + 57ede89c3f7139e402ffbe52923bad19416014a7 - + https://github.com/dotnet/aspnetcore - 1c8f20be1fc4e97044d7ca93edae3af528bc3521 + 57ede89c3f7139e402ffbe52923bad19416014a7 - + https://github.com/dotnet/aspnetcore - 1c8f20be1fc4e97044d7ca93edae3af528bc3521 + 57ede89c3f7139e402ffbe52923bad19416014a7 - + https://github.com/dotnet/aspnetcore - 1c8f20be1fc4e97044d7ca93edae3af528bc3521 + 57ede89c3f7139e402ffbe52923bad19416014a7 - + https://github.com/dotnet/sdk - 722cfe0512e8ef858287d3dcaf0c5e88ed336330 + 874eedacf1c731d2daaaa56d59a1bf27c82d84fe - + https://github.com/dotnet/sdk - 722cfe0512e8ef858287d3dcaf0c5e88ed336330 + 874eedacf1c731d2daaaa56d59a1bf27c82d84fe - + https://github.com/dotnet/sdk - 722cfe0512e8ef858287d3dcaf0c5e88ed336330 + 874eedacf1c731d2daaaa56d59a1bf27c82d84fe - + https://github.com/dotnet/sdk - 722cfe0512e8ef858287d3dcaf0c5e88ed336330 + 874eedacf1c731d2daaaa56d59a1bf27c82d84fe - + https://github.com/dotnet/sdk - 722cfe0512e8ef858287d3dcaf0c5e88ed336330 + 874eedacf1c731d2daaaa56d59a1bf27c82d84fe @@ -148,9 +148,9 @@ https://github.com/dotnet/winforms 7b7e9b0f5cf667be3326ed8cf11be1f825da672b - + https://github.com/dotnet/wpf - 69b072ec137ebf5b2efa9d7ffa40183d70625ae2 + ee1e9e41c53857653047db7d277960de5a06560b https://github.com/dotnet/fsharp @@ -172,18 +172,18 @@ 1cd0d8998250d36c95ed65a76304ef5d1b33e98f - + https://github.com/dotnet/runtime - e612bf4d0b6f08623092902c34a504e932388664 + 83b0d939bedadf7d782b0b26307c2d8c1d5b76f4 - + https://github.com/dotnet/roslyn - 70c173446a3b354fb586e51301fc79aa809fafb4 + ac363f85274ed075096c723ff8bc331da4ed8c67 - + https://github.com/dotnet/roslyn - 70c173446a3b354fb586e51301fc79aa809fafb4 + ac363f85274ed075096c723ff8bc331da4ed8c67 diff --git a/eng/Versions.props b/eng/Versions.props index 69f66cfc3..51fbef1cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,7 +51,7 @@ - 9.0.0-preview.4.24177.5 + 9.0.0-preview.4.24178.4 @@ -67,49 +67,49 @@ - 9.0.0-preview.4.24177.3 - 9.0.0-preview.4.24177.3 - 9.0.0-preview.4.24177.3 - 9.0.0-preview.4.24177.3 - 9.0.0-preview.4.24177.3 - 9.0.0-preview.4.24177.3 - 9.0.0-preview.4.24177.3 + 9.0.0-preview.4.24179.1 + 9.0.0-preview.4.24179.1 + 9.0.0-preview.4.24179.1 + 9.0.0-preview.4.24179.1 + 9.0.0-preview.4.24179.1 + 9.0.0-preview.4.24179.1 + 9.0.0-preview.4.24179.1 0.2.0 - 9.0.100-preview.4.24178.27 - 9.0.100-preview.4.24178.27 - 9.0.100-preview.4.24178.27 + 9.0.100-preview.4.24179.9 + 9.0.100-preview.4.24179.9 + 9.0.100-preview.4.24179.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-1.24177.10 + 4.11.0-1.24178.11 - 9.0.0-preview.4.24178.3 + 9.0.0-preview.4.24178.9 - 9.0.0-preview.4.24178.3 - 9.0.0-preview.4.24178.3 - 9.0.0-preview.4.24178.3 - 9.0.0-preview.4.24178.3 - 9.0.0-preview.4.24178.3 + 9.0.0-preview.4.24178.9 + 9.0.0-preview.4.24178.9 + 9.0.0-preview.4.24178.9 + 9.0.0-preview.4.24178.9 + 9.0.0-preview.4.24178.9 2.1.0 - 9.0.0-preview.4.24178.2 - 9.0.0-preview.4.24178.2 - 9.0.0-preview.4.24178.2 - 9.0.0-preview.4.24178.2 + 9.0.0-preview.4.24178.3 + 9.0.0-preview.4.24178.3 + 9.0.0-preview.4.24178.3 + 9.0.0-preview.4.24178.3 From f57e4665bd583618f498af4bd8d53221f90fca88 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Sat, 30 Mar 2024 02:07:03 -0700 Subject: [PATCH 04/13] Package source mappings - follow up (#19223) --- ...UpdateNuGetConfigPackageSourcesMappings.cs | 99 ++++++++++++------- .../repo-projects/Directory.Build.props | 3 + .../repo-projects/Directory.Build.targets | 11 ++- .../source-build-reference-packages.proj | 2 +- 4 files changed, 77 insertions(+), 38 deletions(-) diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs index 05d1439a9..0fdd8fce5 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs @@ -22,8 +22,9 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks * For previously source-built sources (PSB), add only the packages that do not exist in any of the current source-built sources. * Also add PSB packages if that package version does not exist in current package sources. * In offline build, remove all existing package source mappings for online sources. - * In online build, filter existing package source mappings to remove anything that exists in any source-build source. - * In online build, if NuGet.config didn't have any mappings, add default "*" pattern for all online sources. + * In online build, add online source mappings for all discovered packages from local sources. + * In online build, if NuGet.config didn't originally have any mappings, additionally, + * add default "*" pattern to all online source mappings. */ public class UpdateNuGetConfigPackageSourcesMappings : Task { @@ -43,18 +44,26 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks [Required] public string SbrpRepoSrcPath { get; set; } - private const string SbrpCacheSourceName = "source-build-reference-package-cache"; + [Required] + public string SourceBuiltSourceNamePrefix { get; set; } - // allSourcesPackages contains 'package source', 'list of packages' mappings + public string SbrpCacheSourceName { get; set; } + + public string ReferencePackagesSourceName { get; set; } + + public string PreviouslySourceBuiltSourceName { get; set; } + + public string[] CustomSources { get; set; } + + // allSourcesPackages and oldSourceMappingPatterns contain 'package source', 'list of packages' mappings private Dictionary> allSourcesPackages = []; + private Dictionary> oldSourceMappingPatterns = []; // All other dictionaries are: 'package id', 'list of package versions' private Dictionary> currentPackages = []; private Dictionary> referencePackages = []; - private Dictionary> previouslyBuiltPackages = []; - private Dictionary> oldSourceMappingPatterns = []; - - private string[] CustomSources = ["prebuilt", "net-sdk-supporting-feed"]; + private Dictionary> previouslySourceBuiltPackages = []; + private Dictionary> prebuiltPackages = []; public override bool Execute() { @@ -79,7 +88,7 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks DiscoverPackagesFromAllSourceBuildSources(pkgSourcesElement); // Discover all SBRP packages if source-build-reference-package-cache source is present in NuGet.config - XElement sbrpCacheSourceElement = pkgSourcesElement.Descendants().FirstOrDefault(e => e.Name == "add" && e.Attribute("key").Value == SbrpCacheSourceName); + XElement sbrpCacheSourceElement = GetElement(pkgSourcesElement, "add", SbrpCacheSourceName); if (sbrpCacheSourceElement != null) { DiscoverPackagesFromSbrpCacheSource(); @@ -101,7 +110,7 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks foreach (string packageSource in allSourcesPackages.Keys) { // Skip sources with zero package patterns - if (allSourcesPackages[packageSource] != null) + if (allSourcesPackages[packageSource]?.Count > 0) { pkgSrcMappingClearElement.AddAfterSelf(GetPackageMappingsElementForSource(packageSource)); } @@ -111,21 +120,17 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks // If there are none, add default mappings for all online sources. if (BuildWithOnlineFeeds) { - if (oldSourceMappingPatterns.Count > 0) + foreach (var entry in oldSourceMappingPatterns) { - foreach (var entry in oldSourceMappingPatterns) + // Skip sources with zero package patterns + if (entry.Value?.Count > 0) { - // Skip sources with zero package patterns - if (entry.Value?.Count > 0) - { - pkgSrcMappingElement.Add(GetPackageMappingsElementForSource(entry.Key, entry.Value)); - } + pkgSrcMappingElement.Add(GetPackageMappingsElementForSource(entry.Key, entry.Value)); } } - // Union all package sources to get the distinct list. These will get added to - // the two custom sourcess (prebuilt and net-sdk-supporting-feed) and all online - // sources based on following logic: + // Union all package sources to get the distinct list. These will get added to + // all custom sources and all online sources based on the following logic: // If there were existing mappings for online feeds, add cummulative mappings // from all feeds to these two. // If there were no existing mappings, add default mappings for all online feeds. @@ -159,9 +164,14 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks private void AddMappingsForCustomSources(XElement pkgSrcMappingElement, XElement pkgSourcesElement, List packagePatterns) { + if (CustomSources == null) + { + return; + } + foreach (string sourceName in CustomSources) { - if (null != pkgSourcesElement.Descendants().FirstOrDefault(e => e.Name == "add" && e.Attribute("key").Value == sourceName)) + if (null != GetElement(pkgSourcesElement, "add", sourceName)) { ReplaceSourceMappings(pkgSrcMappingElement, sourceName, packagePatterns); } @@ -176,10 +186,10 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks pkgSrc.Add(new XElement("package", new XAttribute("pattern", packagePattern))); } - XElement pkgSrcMappingClearElement = pkgSrcMappingElement.Descendants().FirstOrDefault(e => e.Name == "packageSource" && e.Attribute("key").Value == sourceName); - if (pkgSrcMappingClearElement != null) + XElement existingPkgSrcElement = GetElement(pkgSrcMappingElement, "packageSource", sourceName); + if (existingPkgSrcElement != null) { - pkgSrcMappingClearElement.ReplaceWith(pkgSrc); + existingPkgSrcElement.ReplaceWith(pkgSrc); } else { @@ -216,9 +226,9 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks private XElement GetPackageMappingsElementForSource(string packageSource) { bool isCurrentSourceBuiltSource = - packageSource.StartsWith("source-built-") || + packageSource.StartsWith(SourceBuiltSourceNamePrefix) || packageSource.Equals(SbrpCacheSourceName) || - packageSource.Equals("reference-packages"); + packageSource.Equals(ReferencePackagesSourceName); XElement pkgSrc = new XElement("packageSource", new XAttribute("key", packageSource)); foreach (string packagePattern in allSourcesPackages[packageSource]) @@ -230,9 +240,20 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks { pkgSrc.Add(new XElement("package", new XAttribute("pattern", packagePattern))); } - else + else if (packageSource.Equals(PreviouslySourceBuiltSourceName)) { - foreach (string version in previouslyBuiltPackages[packagePattern]) + foreach (string version in previouslySourceBuiltPackages[packagePattern]) + { + if (!currentPackages[packagePattern].Contains(version)) + { + pkgSrc.Add(new XElement("package", new XAttribute("pattern", packagePattern))); + break; + } + } + } + else // prebuilt source + { + foreach (string version in prebuiltPackages[packagePattern]) { if (!currentPackages[packagePattern].Contains(version)) { @@ -250,7 +271,7 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks { foreach (string packageSource in SourceBuildSources) { - XElement sourceElement = pkgSourcesElement.Descendants().FirstOrDefault(e => e.Name == "add" && e.Attribute("key").Value == packageSource); + XElement sourceElement = GetElement(pkgSourcesElement, "add", packageSource); if (sourceElement == null) { continue; @@ -270,17 +291,21 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks string version = info.Version.ToLower(); // Add package with version to appropriate hashtable - if (packageSource.StartsWith("source-built-")) + if (packageSource.StartsWith(SourceBuiltSourceNamePrefix)) { AddToDictionary(currentPackages, id, version); } - else if (packageSource.Equals("reference-packages")) + else if (packageSource.Equals(ReferencePackagesSourceName)) { AddToDictionary(referencePackages, id, version); } - else // previously built packages + else if (packageSource.Equals(PreviouslySourceBuiltSourceName)) { - AddToDictionary(previouslyBuiltPackages, id, version); + AddToDictionary(previouslySourceBuiltPackages, id, version); + } + else // prebuilt source + { + AddToDictionary(prebuiltPackages, id, version); } AddToDictionary(allSourcesPackages, packageSource, id); @@ -318,6 +343,11 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks } } + private XElement GetElement(XElement pkgSourcesElement, string name, string key) + { + return pkgSourcesElement.Descendants().FirstOrDefault(e => e.Name == name && e.Attribute("key").Value == key); + } + private void GetExistingFilteredSourceMappings(XElement pkgSrcMappingElement) { foreach (XElement packageSource in pkgSrcMappingElement.Descendants().Where(e => e.Name == "packageSource")) @@ -328,7 +358,8 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks string pattern = package.Attribute("pattern").Value.ToLower(); if (!currentPackages.ContainsKey(pattern) && !referencePackages.ContainsKey(pattern) && - !previouslyBuiltPackages.ContainsKey(pattern)) + !previouslySourceBuiltPackages.ContainsKey(pattern) && + !prebuiltPackages.ContainsKey(pattern)) { filteredPatterns.Add(pattern); } diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index 0dcb96110..2778bbd4b 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -47,6 +47,9 @@ $([MSBuild]::NormalizeDirectory('$(ArtifactsNonShippingPackagesDir)', '$(RepositoryName)')) $(ReferencePackagesDir) + source-build-reference-package-cache + source-built- + $([MSBuild]::ValueOrDefault('$(ARCADE_BOOTSTRAP_VERSION)', '$(ArcadeSdkVersion)')) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index c8eca61db..590a4826c 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -66,8 +66,8 @@ - source-built-%(Identity) - source-built-transport-%(Identity) + $(SourceBuiltSourceNamePrefix)%(Identity) + $(SourceBuiltSourceNamePrefix)transport-%(Identity) $(ArtifactsShippingPackagesDir)/%(Identity)/ $(ArtifactsNonShippingPackagesDir)/%(Identity)/ @@ -190,7 +190,12 @@ NuGetConfigFile="$(NuGetConfigFile)" BuildWithOnlineFeeds="$(DotNetBuildWithOnlineFeeds)" SourceBuildSources="@(_BuildSources)" - SbrpRepoSrcPath="$(SbrpRepoSrcPath)" /> + SbrpRepoSrcPath="$(SbrpRepoSrcPath)" + SbrpCacheSourceName="$(SbrpCacheNuGetSourceName)" + ReferencePackagesSourceName="$(ReferencePackagesNuGetSourceName)" + PreviouslySourceBuiltSourceName="$(PreviouslySourceBuiltNuGetSourceName)" + SourceBuiltSourceNamePrefix="$(SourceBuiltSourceNamePrefix)" + CustomSources="$(NetSdkSupportingFeedName)" /> diff --git a/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj b/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj index 62852f74a..0f0726019 100644 --- a/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj +++ b/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj @@ -27,7 +27,7 @@ From 807d11d0ea521102a6daca970ffa2bbc5699aa68 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 30 Mar 2024 12:19:13 +0000 Subject: [PATCH 05/13] Update dependencies from https://github.com/dotnet/arcade build 20240329.6 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.24178.6 -> To Version 9.0.0-beta.24179.6 --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 2 +- .../templates-official/job/onelocbuild.yml | 2 +- .../templates-official/job/source-build.yml | 2 +- .../post-build/post-build.yml | 6 +++--- .../variables/pool-providers.yml | 2 +- global.json | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a70d8eec8..dd3c75317 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -243,17 +243,17 @@ - + https://github.com/dotnet/arcade - 4345e14684eab24fa2f8217706756dd7c0787d84 + 986a55a9c7f1ef547bc705d6adada5e0c2217819 - + https://github.com/dotnet/arcade - 4345e14684eab24fa2f8217706756dd7c0787d84 + 986a55a9c7f1ef547bc705d6adada5e0c2217819 - + https://github.com/dotnet/arcade - 4345e14684eab24fa2f8217706756dd7c0787d84 + 986a55a9c7f1ef547bc705d6adada5e0c2217819 https://github.com/dotnet/arcade-services @@ -263,14 +263,14 @@ https://github.com/dotnet/arcade-services 0e9abfee048404d9b994fc64235b42216ce68dad - + https://github.com/dotnet/arcade - 4345e14684eab24fa2f8217706756dd7c0787d84 + 986a55a9c7f1ef547bc705d6adada5e0c2217819 - + https://github.com/dotnet/arcade - 4345e14684eab24fa2f8217706756dd7c0787d84 + 986a55a9c7f1ef547bc705d6adada5e0c2217819 diff --git a/eng/Versions.props b/eng/Versions.props index 51fbef1cb..794306ffd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.24178.6 + 9.0.0-beta.24179.6 diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml index ba9ba4930..52b4d05d3 100644 --- a/eng/common/templates-official/job/onelocbuild.yml +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -56,7 +56,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 50f04e642..50d4b98e2 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -52,7 +52,7 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2-pt + image: 1es-mariner-2 os: linux ${{ if ne(parameters.platform.pool, '') }}: diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index d286e956b..da1f40958 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -110,7 +110,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: @@ -150,7 +150,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml @@ -208,7 +208,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml index beab7d1bf..1f308b24e 100644 --- a/eng/common/templates-official/variables/pool-providers.yml +++ b/eng/common/templates-official/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# image: 1es-windows-2022-pt +# image: 1es-windows-2022 variables: # Coalesce the target and source branches so we know when a PR targets a release branch diff --git a/global.json b/global.json index af5d294f0..d68de8bf1 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24178.6", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24178.6" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24179.6", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24179.6" } } From 23a23c5e5efb9d3a2f83fd04d2753d005c92288a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 31 Mar 2024 08:19:19 +0000 Subject: [PATCH 06/13] Update dependencies from https://github.com/dotnet/sdk build 20240331.1 Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-preview.4.24179.9 -> To Version 9.0.100-preview.4.24181.1 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.SourceBuild.Intermediate.runtime.linux-x64,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 9.0.0-preview.4.24178.9 -> To Version 9.0.0-preview.4.24179.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a70d8eec8..a7c6ef5ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,25 +21,25 @@ https://github.com/dotnet/windowsdesktop 73ab0ac1e04fcf7d16a6c1d35fd43a8b46c40a2e - + https://github.com/dotnet/runtime - 83b0d939bedadf7d782b0b26307c2d8c1d5b76f4 + 34d13b27a4f0d62367145bcc1f67f7044ad2328a - + https://github.com/dotnet/runtime - 83b0d939bedadf7d782b0b26307c2d8c1d5b76f4 + 34d13b27a4f0d62367145bcc1f67f7044ad2328a - + https://github.com/dotnet/runtime - 83b0d939bedadf7d782b0b26307c2d8c1d5b76f4 + 34d13b27a4f0d62367145bcc1f67f7044ad2328a - + https://github.com/dotnet/runtime - 83b0d939bedadf7d782b0b26307c2d8c1d5b76f4 + 34d13b27a4f0d62367145bcc1f67f7044ad2328a - + https://github.com/dotnet/runtime - 83b0d939bedadf7d782b0b26307c2d8c1d5b76f4 + 34d13b27a4f0d62367145bcc1f67f7044ad2328a @@ -47,14 +47,14 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 83b0d939bedadf7d782b0b26307c2d8c1d5b76f4 + 34d13b27a4f0d62367145bcc1f67f7044ad2328a - + https://github.com/dotnet/runtime - 83b0d939bedadf7d782b0b26307c2d8c1d5b76f4 + 34d13b27a4f0d62367145bcc1f67f7044ad2328a @@ -91,26 +91,26 @@ 57ede89c3f7139e402ffbe52923bad19416014a7 - + https://github.com/dotnet/sdk - 874eedacf1c731d2daaaa56d59a1bf27c82d84fe + 7bff7cb9eb1a3e7f754e4abfd8f1411f3bae2da4 - + https://github.com/dotnet/sdk - 874eedacf1c731d2daaaa56d59a1bf27c82d84fe + 7bff7cb9eb1a3e7f754e4abfd8f1411f3bae2da4 - + https://github.com/dotnet/sdk - 874eedacf1c731d2daaaa56d59a1bf27c82d84fe + 7bff7cb9eb1a3e7f754e4abfd8f1411f3bae2da4 - + https://github.com/dotnet/sdk - 874eedacf1c731d2daaaa56d59a1bf27c82d84fe + 7bff7cb9eb1a3e7f754e4abfd8f1411f3bae2da4 - + https://github.com/dotnet/sdk - 874eedacf1c731d2daaaa56d59a1bf27c82d84fe + 7bff7cb9eb1a3e7f754e4abfd8f1411f3bae2da4 @@ -172,9 +172,9 @@ 1cd0d8998250d36c95ed65a76304ef5d1b33e98f - + https://github.com/dotnet/runtime - 83b0d939bedadf7d782b0b26307c2d8c1d5b76f4 + 34d13b27a4f0d62367145bcc1f67f7044ad2328a https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 51fbef1cb..308ac4bec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 9.0.100-preview.4.24179.9 - 9.0.100-preview.4.24179.9 - 9.0.100-preview.4.24179.9 + 9.0.100-preview.4.24181.1 + 9.0.100-preview.4.24181.1 + 9.0.100-preview.4.24181.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -93,15 +93,15 @@ - 9.0.0-preview.4.24178.9 + 9.0.0-preview.4.24179.2 - 9.0.0-preview.4.24178.9 - 9.0.0-preview.4.24178.9 - 9.0.0-preview.4.24178.9 - 9.0.0-preview.4.24178.9 - 9.0.0-preview.4.24178.9 + 9.0.0-preview.4.24179.2 + 9.0.0-preview.4.24179.2 + 9.0.0-preview.4.24179.2 + 9.0.0-preview.4.24179.2 + 9.0.0-preview.4.24179.2 2.1.0 From 09b23a24d8288c8412f6f25306d731f5e350567b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 31 Mar 2024 12:17:20 +0000 Subject: [PATCH 07/13] Update dependencies from https://github.com/dotnet/arcade build 20240329.6 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.24178.6 -> To Version 9.0.0-beta.24179.6 From f75c8d7adb1eb5aea908e34fc355adb86169dd41 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Sun, 31 Mar 2024 23:20:00 +0200 Subject: [PATCH 08/13] Always build poison detection (#19245) --- src/SourceBuild/content/eng/Versions.props | 2 +- src/SourceBuild/content/eng/tools/init-build.proj | 6 +++--- .../Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 74c73d7fb..618e11fcd 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -25,7 +25,7 @@ 9.0.100-preview.4.24179.1 9.0.100-preview.4.24179.1 - 15.7.179 + 17.8.3 9.0.0-preview.2.24128.5 9.0.0-preview.2.24128.5 diff --git a/src/SourceBuild/content/eng/tools/init-build.proj b/src/SourceBuild/content/eng/tools/init-build.proj index 6c76a0b14..5c19bbad5 100644 --- a/src/SourceBuild/content/eng/tools/init-build.proj +++ b/src/SourceBuild/content/eng/tools/init-build.proj @@ -94,12 +94,12 @@ - + + Outputs="$(BaseIntermediateOutputPath)BuildLeakDetection.complete"> diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj index 3622b24e4..e37a947e1 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj @@ -6,7 +6,6 @@ - From 6ec3ae487ae43e8ada75d72e0fdf791fe817f68a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 31 Mar 2024 22:29:04 +0000 Subject: [PATCH 09/13] Update dependencies from https://github.com/dotnet/sdk build 20240331.2 Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-preview.4.24179.9 -> To Version 9.0.100-preview.4.24181.2 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.SourceBuild.Intermediate.runtime.linux-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 9.0.0-preview.4.24178.9 -> To Version 9.0.0-preview.4.24180.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7c6ef5ba..cccc1e30e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,25 +21,25 @@ https://github.com/dotnet/windowsdesktop 73ab0ac1e04fcf7d16a6c1d35fd43a8b46c40a2e - + https://github.com/dotnet/runtime - 34d13b27a4f0d62367145bcc1f67f7044ad2328a + cc7bf831f02cad241547ebea5c56c82f12a50999 - + https://github.com/dotnet/runtime - 34d13b27a4f0d62367145bcc1f67f7044ad2328a + cc7bf831f02cad241547ebea5c56c82f12a50999 - + https://github.com/dotnet/runtime - 34d13b27a4f0d62367145bcc1f67f7044ad2328a + cc7bf831f02cad241547ebea5c56c82f12a50999 - + https://github.com/dotnet/runtime - 34d13b27a4f0d62367145bcc1f67f7044ad2328a + cc7bf831f02cad241547ebea5c56c82f12a50999 - + https://github.com/dotnet/runtime - 34d13b27a4f0d62367145bcc1f67f7044ad2328a + cc7bf831f02cad241547ebea5c56c82f12a50999 @@ -47,14 +47,14 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 34d13b27a4f0d62367145bcc1f67f7044ad2328a + cc7bf831f02cad241547ebea5c56c82f12a50999 - + https://github.com/dotnet/runtime - 34d13b27a4f0d62367145bcc1f67f7044ad2328a + cc7bf831f02cad241547ebea5c56c82f12a50999 @@ -91,26 +91,26 @@ 57ede89c3f7139e402ffbe52923bad19416014a7 - + https://github.com/dotnet/sdk - 7bff7cb9eb1a3e7f754e4abfd8f1411f3bae2da4 + 6d4f6d54b6bf7642af31c209bd597e9ca407cbcb - + https://github.com/dotnet/sdk - 7bff7cb9eb1a3e7f754e4abfd8f1411f3bae2da4 + 6d4f6d54b6bf7642af31c209bd597e9ca407cbcb - + https://github.com/dotnet/sdk - 7bff7cb9eb1a3e7f754e4abfd8f1411f3bae2da4 + 6d4f6d54b6bf7642af31c209bd597e9ca407cbcb - + https://github.com/dotnet/sdk - 7bff7cb9eb1a3e7f754e4abfd8f1411f3bae2da4 + 6d4f6d54b6bf7642af31c209bd597e9ca407cbcb - + https://github.com/dotnet/sdk - 7bff7cb9eb1a3e7f754e4abfd8f1411f3bae2da4 + 6d4f6d54b6bf7642af31c209bd597e9ca407cbcb @@ -152,14 +152,14 @@ https://github.com/dotnet/wpf ee1e9e41c53857653047db7d277960de5a06560b - + https://github.com/dotnet/fsharp - 20b263ab495669df94b309fce12584b207dc765c + b3701b7936766cf73224c7a55ba04a046b3d1a28 - + https://github.com/dotnet/fsharp - 20b263ab495669df94b309fce12584b207dc765c + b3701b7936766cf73224c7a55ba04a046b3d1a28 @@ -172,9 +172,9 @@ 1cd0d8998250d36c95ed65a76304ef5d1b33e98f - + https://github.com/dotnet/runtime - 34d13b27a4f0d62367145bcc1f67f7044ad2328a + cc7bf831f02cad241547ebea5c56c82f12a50999 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 308ac4bec..4792205ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 9.0.100-preview.4.24181.1 - 9.0.100-preview.4.24181.1 - 9.0.100-preview.4.24181.1 + 9.0.100-preview.4.24181.2 + 9.0.100-preview.4.24181.2 + 9.0.100-preview.4.24181.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -93,15 +93,15 @@ - 9.0.0-preview.4.24179.2 + 9.0.0-preview.4.24180.3 - 9.0.0-preview.4.24179.2 - 9.0.0-preview.4.24179.2 - 9.0.0-preview.4.24179.2 - 9.0.0-preview.4.24179.2 - 9.0.0-preview.4.24179.2 + 9.0.0-preview.4.24180.3 + 9.0.0-preview.4.24180.3 + 9.0.0-preview.4.24180.3 + 9.0.0-preview.4.24180.3 + 9.0.0-preview.4.24180.3 2.1.0 From 75d2648152070c72515d538fa45c6eb1c819a99c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 1 Apr 2024 03:02:29 +0000 Subject: [PATCH 10/13] Update dependencies from https://github.com/dotnet/sdk build 20240331.3 Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-preview.4.24181.2 -> To Version 9.0.100-preview.4.24181.3 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.SourceBuild.Intermediate.runtime.linux-x64,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.SourceBuild.Intermediate.aspnetcore,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 9.0.0-preview.4.24180.3 -> To Version 9.0.0-preview.4.24181.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 621939f88..454f16cd5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,25 +21,25 @@ https://github.com/dotnet/windowsdesktop 73ab0ac1e04fcf7d16a6c1d35fd43a8b46c40a2e - + https://github.com/dotnet/runtime - cc7bf831f02cad241547ebea5c56c82f12a50999 + 1949bd2e017a0dc1e48b7cfed263051a6ed147a5 - + https://github.com/dotnet/runtime - cc7bf831f02cad241547ebea5c56c82f12a50999 + 1949bd2e017a0dc1e48b7cfed263051a6ed147a5 - + https://github.com/dotnet/runtime - cc7bf831f02cad241547ebea5c56c82f12a50999 + 1949bd2e017a0dc1e48b7cfed263051a6ed147a5 - + https://github.com/dotnet/runtime - cc7bf831f02cad241547ebea5c56c82f12a50999 + 1949bd2e017a0dc1e48b7cfed263051a6ed147a5 - + https://github.com/dotnet/runtime - cc7bf831f02cad241547ebea5c56c82f12a50999 + 1949bd2e017a0dc1e48b7cfed263051a6ed147a5 @@ -47,70 +47,70 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - cc7bf831f02cad241547ebea5c56c82f12a50999 + 1949bd2e017a0dc1e48b7cfed263051a6ed147a5 - + https://github.com/dotnet/runtime - cc7bf831f02cad241547ebea5c56c82f12a50999 + 1949bd2e017a0dc1e48b7cfed263051a6ed147a5 - + https://github.com/dotnet/aspnetcore - 57ede89c3f7139e402ffbe52923bad19416014a7 + 6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60 - + https://github.com/dotnet/aspnetcore - 57ede89c3f7139e402ffbe52923bad19416014a7 + 6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60 - + https://github.com/dotnet/aspnetcore - 57ede89c3f7139e402ffbe52923bad19416014a7 + 6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60 - + https://github.com/dotnet/aspnetcore - 57ede89c3f7139e402ffbe52923bad19416014a7 + 6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60 - + https://github.com/dotnet/aspnetcore - 57ede89c3f7139e402ffbe52923bad19416014a7 + 6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60 - + https://github.com/dotnet/aspnetcore - 57ede89c3f7139e402ffbe52923bad19416014a7 + 6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60 - + https://github.com/dotnet/aspnetcore - 57ede89c3f7139e402ffbe52923bad19416014a7 + 6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60 - + https://github.com/dotnet/aspnetcore - 57ede89c3f7139e402ffbe52923bad19416014a7 + 6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60 - + https://github.com/dotnet/sdk - 6d4f6d54b6bf7642af31c209bd597e9ca407cbcb + 6986678264fe169cf054a7fc7d9499fe7a96d31e - + https://github.com/dotnet/sdk - 6d4f6d54b6bf7642af31c209bd597e9ca407cbcb + 6986678264fe169cf054a7fc7d9499fe7a96d31e - + https://github.com/dotnet/sdk - 6d4f6d54b6bf7642af31c209bd597e9ca407cbcb + 6986678264fe169cf054a7fc7d9499fe7a96d31e - + https://github.com/dotnet/sdk - 6d4f6d54b6bf7642af31c209bd597e9ca407cbcb + 6986678264fe169cf054a7fc7d9499fe7a96d31e - + https://github.com/dotnet/sdk - 6d4f6d54b6bf7642af31c209bd597e9ca407cbcb + 6986678264fe169cf054a7fc7d9499fe7a96d31e @@ -172,9 +172,9 @@ 1cd0d8998250d36c95ed65a76304ef5d1b33e98f - + https://github.com/dotnet/runtime - cc7bf831f02cad241547ebea5c56c82f12a50999 + 1949bd2e017a0dc1e48b7cfed263051a6ed147a5 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 0f9faf543..2f70cf78d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,22 +67,22 @@ - 9.0.0-preview.4.24179.1 - 9.0.0-preview.4.24179.1 - 9.0.0-preview.4.24179.1 - 9.0.0-preview.4.24179.1 - 9.0.0-preview.4.24179.1 - 9.0.0-preview.4.24179.1 - 9.0.0-preview.4.24179.1 + 9.0.0-preview.4.24179.2 + 9.0.0-preview.4.24179.2 + 9.0.0-preview.4.24179.2 + 9.0.0-preview.4.24179.2 + 9.0.0-preview.4.24179.2 + 9.0.0-preview.4.24179.2 + 9.0.0-preview.4.24179.2 0.2.0 - 9.0.100-preview.4.24181.2 - 9.0.100-preview.4.24181.2 - 9.0.100-preview.4.24181.2 + 9.0.100-preview.4.24181.3 + 9.0.100-preview.4.24181.3 + 9.0.100-preview.4.24181.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -93,15 +93,15 @@ - 9.0.0-preview.4.24180.3 + 9.0.0-preview.4.24181.1 - 9.0.0-preview.4.24180.3 - 9.0.0-preview.4.24180.3 - 9.0.0-preview.4.24180.3 - 9.0.0-preview.4.24180.3 - 9.0.0-preview.4.24180.3 + 9.0.0-preview.4.24181.1 + 9.0.0-preview.4.24181.1 + 9.0.0-preview.4.24181.1 + 9.0.0-preview.4.24181.1 + 9.0.0-preview.4.24181.1 2.1.0 From 472547ae27a0d39e91ece243aeed6a998b37fc69 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 1 Apr 2024 04:26:32 +0000 Subject: [PATCH 11/13] Update dependencies from https://github.com/dotnet/sdk build 20240331.4 Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-preview.4.24181.2 -> To Version 9.0.100-preview.4.24181.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.SourceBuild.Intermediate.runtime.linux-x64,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.SourceBuild.Intermediate.aspnetcore,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.SourceBuild.Intermediate.roslyn,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 9.0.0-preview.4.24178.3 -> To Version 9.0.0-preview.4.24181.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++-------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 454f16cd5..7248b6463 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 73ab0ac1e04fcf7d16a6c1d35fd43a8b46c40a2e + 672c180b467833f824fd19cab7ac76a73138ab6c - + https://github.com/dotnet/windowsdesktop - 73ab0ac1e04fcf7d16a6c1d35fd43a8b46c40a2e + 672c180b467833f824fd19cab7ac76a73138ab6c - + https://github.com/dotnet/windowsdesktop - 73ab0ac1e04fcf7d16a6c1d35fd43a8b46c40a2e + 672c180b467833f824fd19cab7ac76a73138ab6c - + https://github.com/dotnet/windowsdesktop - 73ab0ac1e04fcf7d16a6c1d35fd43a8b46c40a2e + 672c180b467833f824fd19cab7ac76a73138ab6c https://github.com/dotnet/runtime @@ -91,26 +91,26 @@ 6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60 - + https://github.com/dotnet/sdk - 6986678264fe169cf054a7fc7d9499fe7a96d31e + 71eb048d845fa962817ed1666cec01788bf519f3 - + https://github.com/dotnet/sdk - 6986678264fe169cf054a7fc7d9499fe7a96d31e + 71eb048d845fa962817ed1666cec01788bf519f3 - + https://github.com/dotnet/sdk - 6986678264fe169cf054a7fc7d9499fe7a96d31e + 71eb048d845fa962817ed1666cec01788bf519f3 - + https://github.com/dotnet/sdk - 6986678264fe169cf054a7fc7d9499fe7a96d31e + 71eb048d845fa962817ed1666cec01788bf519f3 - + https://github.com/dotnet/sdk - 6986678264fe169cf054a7fc7d9499fe7a96d31e + 71eb048d845fa962817ed1666cec01788bf519f3 @@ -144,13 +144,13 @@ - + https://github.com/dotnet/winforms - 7b7e9b0f5cf667be3326ed8cf11be1f825da672b + 5cc859511608804df7a4fd16cb7b7503fd8d76d8 - + https://github.com/dotnet/wpf - ee1e9e41c53857653047db7d277960de5a06560b + 7b356d191513c508297f3c83640dcda10d3b1c7c https://github.com/dotnet/fsharp @@ -176,14 +176,14 @@ https://github.com/dotnet/runtime 1949bd2e017a0dc1e48b7cfed263051a6ed147a5 - + https://github.com/dotnet/roslyn - ac363f85274ed075096c723ff8bc331da4ed8c67 + 0288056413b6de0d0941b0b1ed770c273d870fb0 - + https://github.com/dotnet/roslyn - ac363f85274ed075096c723ff8bc331da4ed8c67 + 0288056413b6de0d0941b0b1ed770c273d870fb0 diff --git a/eng/Versions.props b/eng/Versions.props index 2f70cf78d..69640a3ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 9.0.0-preview.4.24177.4 + 9.0.0-preview.4.24180.1 - 9.0.0-preview.4.24178.4 + 9.0.0-preview.4.24180.2 @@ -80,16 +80,16 @@ - 9.0.100-preview.4.24181.3 - 9.0.100-preview.4.24181.3 - 9.0.100-preview.4.24181.3 + 9.0.100-preview.4.24181.4 + 9.0.100-preview.4.24181.4 + 9.0.100-preview.4.24181.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-1.24178.11 + 4.11.0-1.24180.2 @@ -106,10 +106,10 @@ - 9.0.0-preview.4.24178.3 - 9.0.0-preview.4.24178.3 - 9.0.0-preview.4.24178.3 - 9.0.0-preview.4.24178.3 + 9.0.0-preview.4.24181.1 + 9.0.0-preview.4.24181.1 + 9.0.0-preview.4.24181.1 + 9.0.0-preview.4.24181.1 From ca0026f5eeff0d95eed1abf32d903acbf7a39532 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 1 Apr 2024 06:40:27 +0000 Subject: [PATCH 12/13] Update dependencies from https://github.com/dotnet/sdk build 20240331.5 Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-preview.4.24181.2 -> To Version 9.0.100-preview.4.24181.5 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.SourceBuild.Intermediate.runtime.linux-x64,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.SourceBuild.Intermediate.aspnetcore,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.SourceBuild.Intermediate.roslyn,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 9.0.0-preview.4.24178.3 -> To Version 9.0.0-preview.4.24181.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7248b6463..b231c39fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,26 +91,26 @@ 6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60 - + https://github.com/dotnet/sdk - 71eb048d845fa962817ed1666cec01788bf519f3 + acd489ee0dae8d34e75986978cfd3f2bce1b2288 - + https://github.com/dotnet/sdk - 71eb048d845fa962817ed1666cec01788bf519f3 + acd489ee0dae8d34e75986978cfd3f2bce1b2288 - + https://github.com/dotnet/sdk - 71eb048d845fa962817ed1666cec01788bf519f3 + acd489ee0dae8d34e75986978cfd3f2bce1b2288 - + https://github.com/dotnet/sdk - 71eb048d845fa962817ed1666cec01788bf519f3 + acd489ee0dae8d34e75986978cfd3f2bce1b2288 - + https://github.com/dotnet/sdk - 71eb048d845fa962817ed1666cec01788bf519f3 + acd489ee0dae8d34e75986978cfd3f2bce1b2288 @@ -186,14 +186,14 @@ 0288056413b6de0d0941b0b1ed770c273d870fb0 - + https://github.com/dotnet/msbuild - fc88a31e448201028ca50f890fea3a9878d7c534 + 7ca3c98fad986066bbf2802c863236b4a0f4e34a - + https://github.com/dotnet/msbuild - fc88a31e448201028ca50f890fea3a9878d7c534 + 7ca3c98fad986066bbf2802c863236b4a0f4e34a diff --git a/eng/Versions.props b/eng/Versions.props index 69640a3ed..e73df7152 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 9.0.100-preview.4.24181.4 - 9.0.100-preview.4.24181.4 - 9.0.100-preview.4.24181.4 + 9.0.100-preview.4.24181.5 + 9.0.100-preview.4.24181.5 + 9.0.100-preview.4.24181.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9d560703b6cdffba86d9da2c3bc058e4a3f0aca8 Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Mon, 1 Apr 2024 10:18:07 -0700 Subject: [PATCH 13/13] Delete Application-Insights patch (#19160) --- ...ngrade-Microsoft.ApplicationInsights.patch | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 src/SourceBuild/patches/arcade/0001-Downgrade-Microsoft.ApplicationInsights.patch diff --git a/src/SourceBuild/patches/arcade/0001-Downgrade-Microsoft.ApplicationInsights.patch b/src/SourceBuild/patches/arcade/0001-Downgrade-Microsoft.ApplicationInsights.patch deleted file mode 100644 index 03495fc1e..000000000 --- a/src/SourceBuild/patches/arcade/0001-Downgrade-Microsoft.ApplicationInsights.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ella Hathaway -Date: Wed, 13 Mar 2024 22:02:04 +0000 -Subject: [PATCH] Downgrade Microsoft.ApplicationInsights - -Backport: https://github.com/dotnet/source-build/issues/4228 - ---- - Directory.Packages.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index 7546dc0b..09a3f791 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -76,7 +76,7 @@ - - - -- -+ - - -