diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 279ed429b184..bbcabdbbd636 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,41 +4,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 - d04391a8d9c6140c58dbd34009f231c258d65eb8 + c8b67095ab5f6342f86e1fb32f8f8038dd381352 - + https://github.com/dotnet/windowsdesktop - d04391a8d9c6140c58dbd34009f231c258d65eb8 + c8b67095ab5f6342f86e1fb32f8f8038dd381352 - + https://github.com/dotnet/windowsdesktop - d04391a8d9c6140c58dbd34009f231c258d65eb8 + c8b67095ab5f6342f86e1fb32f8f8038dd381352 - + https://github.com/dotnet/windowsdesktop - d04391a8d9c6140c58dbd34009f231c258d65eb8 + c8b67095ab5f6342f86e1fb32f8f8038dd381352 - + https://github.com/dotnet/runtime - 86a1911d7cbff65fc82b373e7fece572c9f0fd52 + b0118bebe385cb68f272a32ca6a5c5bb53c9b14f - + https://github.com/dotnet/runtime - 86a1911d7cbff65fc82b373e7fece572c9f0fd52 + b0118bebe385cb68f272a32ca6a5c5bb53c9b14f - + https://github.com/dotnet/runtime - 86a1911d7cbff65fc82b373e7fece572c9f0fd52 + b0118bebe385cb68f272a32ca6a5c5bb53c9b14f - + https://github.com/dotnet/runtime - 86a1911d7cbff65fc82b373e7fece572c9f0fd52 + b0118bebe385cb68f272a32ca6a5c5bb53c9b14f - + https://github.com/dotnet/runtime - 86a1911d7cbff65fc82b373e7fece572c9f0fd52 + b0118bebe385cb68f272a32ca6a5c5bb53c9b14f @@ -46,70 +46,70 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 86a1911d7cbff65fc82b373e7fece572c9f0fd52 + b0118bebe385cb68f272a32ca6a5c5bb53c9b14f - + https://github.com/dotnet/runtime - 86a1911d7cbff65fc82b373e7fece572c9f0fd52 + b0118bebe385cb68f272a32ca6a5c5bb53c9b14f - + https://github.com/dotnet/aspnetcore - 7412c71cf881392233b5652310ab2b9e7fdf71eb + 7d5309210d8f7bae8fa074da495e9d009d67f1b4 - + https://github.com/dotnet/aspnetcore - 7412c71cf881392233b5652310ab2b9e7fdf71eb + 7d5309210d8f7bae8fa074da495e9d009d67f1b4 - + https://github.com/dotnet/aspnetcore - 7412c71cf881392233b5652310ab2b9e7fdf71eb + 7d5309210d8f7bae8fa074da495e9d009d67f1b4 - + https://github.com/dotnet/aspnetcore - 7412c71cf881392233b5652310ab2b9e7fdf71eb + 7d5309210d8f7bae8fa074da495e9d009d67f1b4 - + https://github.com/dotnet/aspnetcore - 7412c71cf881392233b5652310ab2b9e7fdf71eb + 7d5309210d8f7bae8fa074da495e9d009d67f1b4 - + https://github.com/dotnet/aspnetcore - 7412c71cf881392233b5652310ab2b9e7fdf71eb + 7d5309210d8f7bae8fa074da495e9d009d67f1b4 - + https://github.com/dotnet/aspnetcore - 7412c71cf881392233b5652310ab2b9e7fdf71eb + 7d5309210d8f7bae8fa074da495e9d009d67f1b4 - + https://github.com/dotnet/aspnetcore - 7412c71cf881392233b5652310ab2b9e7fdf71eb + 7d5309210d8f7bae8fa074da495e9d009d67f1b4 - + https://github.com/dotnet/sdk - a1bcf78cd09343b30bda62dfbcf495edc02bfcaf + a4242bf39e7f39c999e5a699931a5bf9f7821bc5 - + https://github.com/dotnet/sdk - a1bcf78cd09343b30bda62dfbcf495edc02bfcaf + a4242bf39e7f39c999e5a699931a5bf9f7821bc5 - + https://github.com/dotnet/sdk - a1bcf78cd09343b30bda62dfbcf495edc02bfcaf + a4242bf39e7f39c999e5a699931a5bf9f7821bc5 - + https://github.com/dotnet/sdk - a1bcf78cd09343b30bda62dfbcf495edc02bfcaf + a4242bf39e7f39c999e5a699931a5bf9f7821bc5 - + https://github.com/dotnet/sdk - a1bcf78cd09343b30bda62dfbcf495edc02bfcaf + a4242bf39e7f39c999e5a699931a5bf9f7821bc5 @@ -143,22 +143,22 @@ - + https://github.com/dotnet/winforms - c7aef4e2932a2ee77d3f923dd18ab9fb65566348 + c0dad198e0c75e50ebefaea76a5bf42f4f0b25ba - + https://github.com/dotnet/wpf - b769d01cd9e41e755513d0c2cee577e838d5ab80 + 1b852a4e44a0f60310fe1d6eda6b5fefb2f9ef38 - + https://github.com/dotnet/fsharp - d11b46f7cdaa90ab5663bf16f7f54349204545a9 + 27efc282d3c1e3abdf8322191e09d0fe466c489e - + https://github.com/dotnet/fsharp - d11b46f7cdaa90ab5663bf16f7f54349204545a9 + 27efc282d3c1e3abdf8322191e09d0fe466c489e @@ -171,43 +171,43 @@ 56d28849af08dc3143d019694aa92f186b89d2ac - + https://github.com/dotnet/runtime - 86a1911d7cbff65fc82b373e7fece572c9f0fd52 + b0118bebe385cb68f272a32ca6a5c5bb53c9b14f - + https://github.com/dotnet/roslyn - 7b18089cb8f4c5a16de67205236522ba86b0a1c0 + e465daf014a2b82e87d36eaef0942a07c2e44812 - + https://github.com/dotnet/roslyn - 7b18089cb8f4c5a16de67205236522ba86b0a1c0 + e465daf014a2b82e87d36eaef0942a07c2e44812 - + https://github.com/dotnet/msbuild - 367149434a51b18724b7a92b419644fabf06604f + 195e9289b39c4e5cd5d25e9422fcc4a93f95cefa - + https://github.com/dotnet/msbuild - 367149434a51b18724b7a92b419644fabf06604f + 195e9289b39c4e5cd5d25e9422fcc4a93f95cefa - + https://github.com/nuget/nuget.client - d01e48ace560689897c1c642591659126736feb8 + e9355040881280a661c9d8f9428d07aba1d05d97 - + https://github.com/dotnet/emsdk - c42ff642a91a8aa4345de1728c3fa585ec13e1e6 + 19c9523f5c2dd091b49959700723af795d6ad2b4 - + https://github.com/dotnet/emsdk - c42ff642a91a8aa4345de1728c3fa585ec13e1e6 + 19c9523f5c2dd091b49959700723af795d6ad2b4 diff --git a/eng/Versions.props b/eng/Versions.props index 9d39cdaa5a5b..b6bd37bd39fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 9.0.0-preview.4.24215.3 + 9.0.0-preview.4.24218.1 - 9.0.0-preview.4.24216.1 + 9.0.0-preview.4.24218.2 @@ -67,49 +67,49 @@ - 9.0.0-preview.4.24216.18 - 9.0.0-preview.4.24216.18 - 9.0.0-preview.4.24216.18 - 9.0.0-preview.4.24216.18 - 9.0.0-preview.4.24216.18 - 9.0.0-preview.4.24216.18 - 9.0.0-preview.4.24216.18 + 9.0.0-preview.4.24218.1 + 9.0.0-preview.4.24218.1 + 9.0.0-preview.4.24218.1 + 9.0.0-preview.4.24218.1 + 9.0.0-preview.4.24218.1 + 9.0.0-preview.4.24218.1 + 9.0.0-preview.4.24218.1 0.2.0 - 9.0.100-preview.4.24216.57 - 9.0.100-preview.4.24216.57 - 9.0.100-preview.4.24216.57 + 9.0.100-preview.4.24218.18 + 9.0.100-preview.4.24218.18 + 9.0.100-preview.4.24218.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-1.24216.11 + 4.11.0-1.24218.2 - 9.0.0-preview.4.24215.5 + 9.0.0-preview.4.24218.7 - 9.0.0-preview.4.24215.5 - 9.0.0-preview.4.24215.5 - 9.0.0-preview.4.24215.5 - 9.0.0-preview.4.24215.5 - 9.0.0-preview.4.24215.5 + 9.0.0-preview.4.24218.7 + 9.0.0-preview.4.24218.7 + 9.0.0-preview.4.24218.7 + 9.0.0-preview.4.24218.7 + 9.0.0-preview.4.24218.7 2.1.0 - 9.0.0-preview.4.24216.16 - 9.0.0-preview.4.24216.16 - 9.0.0-preview.4.24216.16 - 9.0.0-preview.4.24216.16 + 9.0.0-preview.4.24218.3 + 9.0.0-preview.4.24218.3 + 9.0.0-preview.4.24218.3 + 9.0.0-preview.4.24218.3 @@ -120,7 +120,7 @@ - 6.11.0-preview.1.23 + 6.11.0-preview.1.27 @@ -225,7 +225,7 @@ 14.2.9088-net9-p1 17.2.9088-net9-p1 - 9.0.0-preview.4.24209.5 + 9.0.0-preview.4.24215.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/eng/pipelines/templates/steps/vmr-pull-updates.yml b/eng/pipelines/templates/steps/vmr-pull-updates.yml index d80ae5ebe471..4bf96835916b 100644 --- a/eng/pipelines/templates/steps/vmr-pull-updates.yml +++ b/eng/pipelines/templates/steps/vmr-pull-updates.yml @@ -66,6 +66,10 @@ steps: condition: ne(variables['Agent.OS'], 'Windows_NT') workingDirectory: $(Agent.BuildDirectory)/installer +- script: git config --global diff.astextplain.textconv echo + displayName: Disable astextplain in git diff (Windows) + condition: eq(variables['Agent.OS'], 'Windows_NT') + - powershell: > ./eng/vmr-sync.ps1 ` -vmr ${{ parameters.vmrPath }} ` diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index 552ae8e3703d..8e4e9e2cd488 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -56,11 +56,6 @@ RemoveMetadata="MSBuildSourceProjectFile;MSBuildSourceTargetName;OriginalItemSpec" /> - - - - - diff --git a/src/SourceBuild/content/repo-projects/nuget-client.proj b/src/SourceBuild/content/repo-projects/nuget-client.proj index 2676fa676e75..0e3c3a4bc454 100644 --- a/src/SourceBuild/content/repo-projects/nuget-client.proj +++ b/src/SourceBuild/content/repo-projects/nuget-client.proj @@ -4,8 +4,14 @@ $(KeysDir)NuGet.Client.snk true + + - $([MSBuild]::NormalizePath('$(ProjectDirectory)', 'eng', 'source-build', 'build$(ShellExtension)')) + $([MSBuild]::NormalizePath('$(ProjectDirectory)', 'eng', 'dotnet-build', 'build$(ShellExtension)')) + + $(BuildArgs) /p:GenerateResourceUsePreserializedResources=true + + false diff --git a/src/SourceBuild/patches/efcore/0001-Various-fixes-for-issues-in-efcore-in-VMR-build.patch b/src/SourceBuild/patches/efcore/0001-Various-fixes-for-issues-in-efcore-in-VMR-build.patch deleted file mode 100644 index 9b1bf007c6b0..000000000000 --- a/src/SourceBuild/patches/efcore/0001-Various-fixes-for-issues-in-efcore-in-VMR-build.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a6d02a6f3859f341707a8c5fd76b68e2f13a5a86 Mon Sep 17 00:00:00 2001 -From: Jeremy Koritzinsky -Date: Mon, 15 Apr 2024 12:16:14 -0700 -Subject: [PATCH] Various fixes for issues in efcore-in-VMR build (#33540) - -Backport: https://github.com/dotnet/efcore/pull/33540 - ---- - Directory.Build.props | 1 + - src/dotnet-ef/Project.cs | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 3a445c23b9d..80858aaddfc 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -10,6 +10,7 @@ - ( $(MSBuildProjectName.EndsWith('.Tests')) OR - $(MSBuildProjectName.EndsWith('.FunctionalTests'))) ">true - false -+ true - $(MSBuildThisFileDirectory) - - -diff --git a/src/dotnet-ef/Project.cs b/src/dotnet-ef/Project.cs -index 1296a2d1c41..4b923364899 100644 ---- a/src/dotnet-ef/Project.cs -+++ b/src/dotnet-ef/Project.cs -@@ -58,7 +58,7 @@ public Project(string file, string? framework, string? configuration, string? ru - "Microsoft.EntityFrameworkCore.Tools.Resources.EntityFrameworkCore.targets")!) - { - efTargets = new byte[input.Length]; -- input.Read(efTargets); -+ input.ReadExactly(efTargets); - } - - var efTargetsPath = Path.Combine( diff --git a/src/SourceBuild/patches/nuget-client/0001-Disable-CA2022-errors.patch b/src/SourceBuild/patches/nuget-client/0001-Disable-CA2022-errors.patch deleted file mode 100644 index 99782bd5fdeb..000000000000 --- a/src/SourceBuild/patches/nuget-client/0001-Disable-CA2022-errors.patch +++ /dev/null @@ -1,39 +0,0 @@ -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;