From bc0a57c3222a3d3138a5b9cc171df4332db31ed2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 2 May 2024 05:59:53 +0000 Subject: [PATCH 1/6] Update dependencies from https://github.com/dotnet/sdk build 20240501.18 Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-preview.5.24230.2 -> To Version 9.0.100-preview.5.24251.18 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.DotNet.Test.ProjectTemplates.9.0,Microsoft.SourceBuild.Intermediate.test-templates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.SourceBuild.Intermediate.vstest,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.SourceBuild.Intermediate.roslyn,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk,Microsoft.DotNet.Darc,Microsoft.DotNet.DarcLib From Version 9.0.0-preview.5.24229.3 -> To Version 9.0.0-preview.5.24251.1 (parent: Microsoft.NET.Sdk --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 152 +++++++++--------- eng/Versions.props | 56 +++---- .../content/eng/Version.Details.xml | 4 +- src/SourceBuild/content/eng/Versions.props | 4 +- src/SourceBuild/content/global.json | 4 +- ...01-Disable-APICompat-for-DotNetBuild.patch | 25 --- 7 files changed, 111 insertions(+), 136 deletions(-) delete mode 100644 src/SourceBuild/patches/runtime/0001-Disable-APICompat-for-DotNetBuild.patch diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 26d8b286ce2d..f5e3d4ffaa60 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24229.1", + "version": "1.1.0-beta.24230.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0983bf03adc8..1b977e01e82e 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 - 6be92da62a4abca596025bd9f9e7440f753e97fe + eee13196b8e551832b995325bddc9aadb957e892 - + https://github.com/dotnet/windowsdesktop - 6be92da62a4abca596025bd9f9e7440f753e97fe + eee13196b8e551832b995325bddc9aadb957e892 - + https://github.com/dotnet/windowsdesktop - 6be92da62a4abca596025bd9f9e7440f753e97fe + eee13196b8e551832b995325bddc9aadb957e892 - + https://github.com/dotnet/windowsdesktop - 6be92da62a4abca596025bd9f9e7440f753e97fe + eee13196b8e551832b995325bddc9aadb957e892 - + https://github.com/dotnet/runtime - 74d927967dcf9dc1801c310603d6dc843dc28ad6 + 4326eb7ed4d03f30ce4a4de1eb028ee76fdaaa3c - + https://github.com/dotnet/runtime - 74d927967dcf9dc1801c310603d6dc843dc28ad6 + 4326eb7ed4d03f30ce4a4de1eb028ee76fdaaa3c - + https://github.com/dotnet/runtime - 74d927967dcf9dc1801c310603d6dc843dc28ad6 + 4326eb7ed4d03f30ce4a4de1eb028ee76fdaaa3c - + https://github.com/dotnet/runtime - 74d927967dcf9dc1801c310603d6dc843dc28ad6 + 4326eb7ed4d03f30ce4a4de1eb028ee76fdaaa3c - + https://github.com/dotnet/runtime - 74d927967dcf9dc1801c310603d6dc843dc28ad6 + 4326eb7ed4d03f30ce4a4de1eb028ee76fdaaa3c @@ -46,70 +46,70 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 74d927967dcf9dc1801c310603d6dc843dc28ad6 + 4326eb7ed4d03f30ce4a4de1eb028ee76fdaaa3c - + https://github.com/dotnet/runtime - 74d927967dcf9dc1801c310603d6dc843dc28ad6 + 4326eb7ed4d03f30ce4a4de1eb028ee76fdaaa3c - + https://github.com/dotnet/aspnetcore - c157c5c1962a66c4fe0212ed767f167bb9cdfb79 + 83b527e6a42d6729df191de8e4aa3fdfdb0d5709 - + https://github.com/dotnet/aspnetcore - c157c5c1962a66c4fe0212ed767f167bb9cdfb79 + 83b527e6a42d6729df191de8e4aa3fdfdb0d5709 - + https://github.com/dotnet/aspnetcore - c157c5c1962a66c4fe0212ed767f167bb9cdfb79 + 83b527e6a42d6729df191de8e4aa3fdfdb0d5709 - + https://github.com/dotnet/aspnetcore - c157c5c1962a66c4fe0212ed767f167bb9cdfb79 + 83b527e6a42d6729df191de8e4aa3fdfdb0d5709 - + https://github.com/dotnet/aspnetcore - c157c5c1962a66c4fe0212ed767f167bb9cdfb79 + 83b527e6a42d6729df191de8e4aa3fdfdb0d5709 - + https://github.com/dotnet/aspnetcore - c157c5c1962a66c4fe0212ed767f167bb9cdfb79 + 83b527e6a42d6729df191de8e4aa3fdfdb0d5709 - + https://github.com/dotnet/aspnetcore - c157c5c1962a66c4fe0212ed767f167bb9cdfb79 + 83b527e6a42d6729df191de8e4aa3fdfdb0d5709 - + https://github.com/dotnet/aspnetcore - c157c5c1962a66c4fe0212ed767f167bb9cdfb79 + 83b527e6a42d6729df191de8e4aa3fdfdb0d5709 - + https://github.com/dotnet/sdk - 4f5ee41ea45e7861aa45056cf422b0edce876f00 + 96a1a0cfd87dd492e3ad340d7353437317ef667e - + https://github.com/dotnet/sdk - 4f5ee41ea45e7861aa45056cf422b0edce876f00 + 96a1a0cfd87dd492e3ad340d7353437317ef667e - + https://github.com/dotnet/sdk - 4f5ee41ea45e7861aa45056cf422b0edce876f00 + 96a1a0cfd87dd492e3ad340d7353437317ef667e - + https://github.com/dotnet/sdk - 4f5ee41ea45e7861aa45056cf422b0edce876f00 + 96a1a0cfd87dd492e3ad340d7353437317ef667e - + https://github.com/dotnet/sdk - 4f5ee41ea45e7861aa45056cf422b0edce876f00 + 96a1a0cfd87dd492e3ad340d7353437317ef667e @@ -132,24 +132,24 @@ https://github.com/dotnet/test-templates 49c9ad01f057b3c6352bbec12b117acc2224493c - + https://github.com/dotnet/test-templates - f23bef195234bbbe7b96f38d056965269fbb3bc0 + a74fa370b91e752af249db46fdf782c742031db8 - + https://github.com/dotnet/test-templates - f23bef195234bbbe7b96f38d056965269fbb3bc0 + a74fa370b91e752af249db46fdf782c742031db8 - + https://github.com/dotnet/winforms - c5967ff09814601cc8828668589ab66b946a4b16 + 2d02446bd48d1e5679423398a9034c202f1aad35 - + https://github.com/dotnet/wpf - 6f044de655b9d41eaade4203c99a14f04edf72c4 + c3d980ee32f93ed7261f589b3645f2996c07e68d https://github.com/dotnet/fsharp @@ -161,28 +161,28 @@ 3ef1cb25ffb292b5c87f9604d1a09b032277bf76 - + https://github.com/microsoft/vstest - 56d28849af08dc3143d019694aa92f186b89d2ac + 822bee2c606a7fc18a0a302c6cf28a61c7b7bb3b - + https://github.com/microsoft/vstest - 56d28849af08dc3143d019694aa92f186b89d2ac + 822bee2c606a7fc18a0a302c6cf28a61c7b7bb3b - + https://github.com/dotnet/runtime - 74d927967dcf9dc1801c310603d6dc843dc28ad6 + 4326eb7ed4d03f30ce4a4de1eb028ee76fdaaa3c - + https://github.com/dotnet/roslyn - b9c44957977af21c20c4addf8b7b788112285003 + f4fcb032ea827b91111d010724cd35e26314aa71 - + https://github.com/dotnet/roslyn - b9c44957977af21c20c4addf8b7b788112285003 + f4fcb032ea827b91111d010724cd35e26314aa71 @@ -195,19 +195,19 @@ d542f3a80101883083b95fff0b67666b63002751 - + https://github.com/nuget/nuget.client - f6615e7a7177dd820b74b007c5f6b691ceedada3 + 12d5c661b77d4933f82a293008c0d56d1d6ce32b - + https://github.com/dotnet/emsdk - 9d28301f6a5f512db14f242f7403a4bfbcbcc8a4 + 53288f87c588907e8ff01f129786820fe998573c - + https://github.com/dotnet/emsdk - 9d28301f6a5f512db14f242f7403a4bfbcbcc8a4 + 53288f87c588907e8ff01f129786820fe998573c @@ -250,13 +250,13 @@ https://github.com/dotnet/arcade be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/arcade-services - 22f983b0e99191ed08c6434d554fc1eab040a2ba + 26e263be5b563ccb6a5699028c3baf9f2d7dd483 - + https://github.com/dotnet/arcade-services - 22f983b0e99191ed08c6434d554fc1eab040a2ba + 26e263be5b563ccb6a5699028c3baf9f2d7dd483 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index bbfa406a8641..b021a5930ac1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,15 +43,15 @@ - 1.1.0-beta.24229.1 + 1.1.0-beta.24230.2 - 9.0.0-preview.5.24228.1 + 9.0.0-preview.5.24230.6 - 9.0.0-preview.5.24229.1 + 9.0.0-preview.5.24230.2 @@ -59,7 +59,7 @@ 1.1.0-rc.24069.1 1.1.0-rc.24069.1 1.1.0-rc.24202.1 - 1.1.0-rc.24229.2 + 1.1.0-rc.24230.1 @@ -67,49 +67,49 @@ - 9.0.0-preview.5.24225.4 - 9.0.0-preview.5.24225.4 - 9.0.0-preview.5.24225.4 - 9.0.0-preview.5.24225.4 - 9.0.0-preview.5.24225.4 - 9.0.0-preview.5.24225.4 - 9.0.0-preview.5.24225.4 + 9.0.0-preview.5.24251.4 + 9.0.0-preview.5.24251.4 + 9.0.0-preview.5.24251.4 + 9.0.0-preview.5.24251.4 + 9.0.0-preview.5.24251.4 + 9.0.0-preview.5.24251.4 + 9.0.0-preview.5.24251.4 0.2.0 - 9.0.100-preview.5.24230.2 - 9.0.100-preview.5.24230.2 - 9.0.100-preview.5.24230.2 + 9.0.100-preview.5.24251.18 + 9.0.100-preview.5.24251.18 + 9.0.100-preview.5.24251.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-2.24229.6 + 4.11.0-2.24230.7 - 9.0.0-preview.4.24225.8 + 9.0.0-preview.4.24251.3 - 9.0.0-preview.4.24225.8 - 9.0.0-preview.4.24225.8 - 9.0.0-preview.4.24225.8 - 9.0.0-preview.4.24225.8 - 9.0.0-preview.4.24225.8 + 9.0.0-preview.4.24251.3 + 9.0.0-preview.4.24251.3 + 9.0.0-preview.4.24251.3 + 9.0.0-preview.4.24251.3 + 9.0.0-preview.4.24251.3 2.1.0 - 9.0.0-preview.5.24229.3 - 9.0.0-preview.5.24229.3 - 9.0.0-preview.5.24229.3 - 9.0.0-preview.5.24229.3 + 9.0.0-preview.5.24251.1 + 9.0.0-preview.5.24251.1 + 9.0.0-preview.5.24251.1 + 9.0.0-preview.5.24251.1 @@ -120,7 +120,7 @@ - 6.11.0-preview.1.32 + 6.11.0-preview.1.35 @@ -209,7 +209,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-release-24203-04 + 17.11.0-preview-24230-01 9.0.0-alpha.1.24058.10 9.0.0-preview.24222.1 @@ -225,7 +225,7 @@ 14.2.9088-net9-p1 17.2.9088-net9-p1 - 9.0.0-preview.4.24222.2 + 9.0.0-preview.5.24223.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/src/SourceBuild/content/eng/Version.Details.xml b/src/SourceBuild/content/eng/Version.Details.xml index 6099c7aa29a6..80727e0719ce 100644 --- a/src/SourceBuild/content/eng/Version.Details.xml +++ b/src/SourceBuild/content/eng/Version.Details.xml @@ -2,9 +2,9 @@ - + https://github.com/dotnet/arcade - 91ce5946fec9f81f15f81d20e1aab63527302410 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 31d914e8f3fa..447dbafa18a1 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -23,8 +23,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.4.24223.1 - 9.0.100-preview.4.24223.1 + 9.0.100-preview.5.24251.1 + 9.0.100-preview.5.24251.1 2.0.0-beta4.24126.1 diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index 36bd8350c05b..e8f82a4d3cc5 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.100-preview.4.24223.7" + "dotnet": "9.0.100-preview.5.24229.2" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24223.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24229.1" } } diff --git a/src/SourceBuild/patches/runtime/0001-Disable-APICompat-for-DotNetBuild.patch b/src/SourceBuild/patches/runtime/0001-Disable-APICompat-for-DotNetBuild.patch deleted file mode 100644 index 52c5a31269e3..000000000000 --- a/src/SourceBuild/patches/runtime/0001-Disable-APICompat-for-DotNetBuild.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3892dc913e63b0f617127c2183aab294de170031 Mon Sep 17 00:00:00 2001 -From: Viktor Hofer -Date: Tue, 30 Apr 2024 17:49:47 +0200 -Subject: [PATCH] Disable APICompat for DotNetBuild - ---- - eng/DotNetBuild.props | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props -index 9d68b8265b0..387ff9082dc 100644 ---- a/eng/DotNetBuild.props -+++ b/eng/DotNetBuild.props -@@ -85,6 +85,10 @@ - $(InnerBuildArgs) /p:SourceBuiltAssetManifestsDir=$(SourceBuiltAssetManifestsDir) - $(InnerBuildArgs) /p:SourceBuiltSymbolsDir=$(SourceBuiltSymbolsDir) - $(InnerBuildArgs) /p:GitHubRepositoryName=$(GitHubRepositoryName) -+ -+ -+ $(InnerBuildArgs) /p:EnablePackageValidation=false -+ $(InnerBuildArgs) /p:ApiCompatValidateAssemblies=false - - - --- From 9ff3a280fe37d9d21f05c8e76f8989da0b7be7f4 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 2 May 2024 21:54:56 +0000 Subject: [PATCH 2/6] Update roslyn patch --- .../roslyn/0001-ambiguous-call-site.patch | 33 ++++++++++++++++--- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/src/SourceBuild/patches/roslyn/0001-ambiguous-call-site.patch b/src/SourceBuild/patches/roslyn/0001-ambiguous-call-site.patch index 85ed8034bfe7..ed342cd3151f 100644 --- a/src/SourceBuild/patches/roslyn/0001-ambiguous-call-site.patch +++ b/src/SourceBuild/patches/roslyn/0001-ambiguous-call-site.patch @@ -1,12 +1,35 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Viktor Hofer -Date: Thu, 2 May 2024 17:22:41 +0000 +From: Michael Simons +Date: Thu, 2 May 2024 21:52:54 +0000 Subject: [PATCH] Avoid ambiguous call site --- - .../Workspace/Core/CodeGeneration/CodeGenerationHelpers.cs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + .../GenerateType/AbstractGenerateTypeService.Editor.cs | 4 ++-- + .../Workspace/Core/CodeGeneration/CodeGenerationHelpers.cs | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) +diff --git a/src/Features/Core/Portable/GenerateType/AbstractGenerateTypeService.Editor.cs b/src/Features/Core/Portable/GenerateType/AbstractGenerateTypeService.Editor.cs +index 8adaaeda551..b099e092c7b 100644 +--- a/src/Features/Core/Portable/GenerateType/AbstractGenerateTypeService.Editor.cs ++++ b/src/Features/Core/Portable/GenerateType/AbstractGenerateTypeService.Editor.cs +@@ -525,7 +525,7 @@ private async Task> GetGenerateIntoContainin + AddFoldersToNamespaceContainers(containerList, folders); + + containers = [.. containerList]; +- includeUsingsOrImports = string.Join(".", [.. containerList]); ++ includeUsingsOrImports = string.Join(".", containerList); + } + + // Case 4 : If the type is generated into the same VB project or +@@ -539,7 +539,7 @@ private async Task> GetGenerateIntoContainin + // Populate the ContainerList + AddFoldersToNamespaceContainers(containerList, folders); + containers = [.. containerList]; +- includeUsingsOrImports = string.Join(".", [.. containerList]); ++ includeUsingsOrImports = string.Join(".", containerList); + if (!string.IsNullOrWhiteSpace(rootNamespaceOfTheProjectGeneratedInto)) + { + includeUsingsOrImports = string.IsNullOrEmpty(includeUsingsOrImports) diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeGeneration/CodeGenerationHelpers.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeGeneration/CodeGenerationHelpers.cs index 3839eb370eb..8d272db6b1b 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeGeneration/CodeGenerationHelpers.cs @@ -14,7 +37,7 @@ index 3839eb370eb..8d272db6b1b 100644 @@ -71,7 +71,7 @@ internal static class CodeGenerationHelpers break; } - + - name = string.Join(".", [.. names]); + name = string.Join(".", names); } From 5d191cc333698618d2ab6b9762630a10236ce55b Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 3 May 2024 14:05:40 +0000 Subject: [PATCH 3/6] Update SDK and SB artifacts to be coherant --- src/SourceBuild/content/eng/Versions.props | 4 ++-- src/SourceBuild/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 447dbafa18a1..351fc6d1eafd 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -23,8 +23,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.5.24251.1 - 9.0.100-preview.5.24251.1 + 9.0.100-preview.5.24253.1 + 9.0.100-preview.5.24253.1 2.0.0-beta4.24126.1 diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index e8f82a4d3cc5..964c5053a1e5 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-preview.5.24229.2" + "dotnet": "9.0.100-preview.5.24253.2" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", From bb8f455694f91ec3b9cf5e47e960a4002e4d36f6 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 3 May 2024 14:56:37 +0000 Subject: [PATCH 4/6] Add vstest patch to address missing file header --- .../0001-Add-missing-copyright-header.patch | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/SourceBuild/patches/vstest/0001-Add-missing-copyright-header.patch diff --git a/src/SourceBuild/patches/vstest/0001-Add-missing-copyright-header.patch b/src/SourceBuild/patches/vstest/0001-Add-missing-copyright-header.patch new file mode 100644 index 000000000000..faa6a2b10b6a --- /dev/null +++ b/src/SourceBuild/patches/vstest/0001-Add-missing-copyright-header.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Fri, 3 May 2024 14:47:13 +0000 +Subject: [PATCH] Add missing copyright header + +--- + .../GlobalSuppressions.cs | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/Microsoft.TestPlatform.CoreUtilities/GlobalSuppressions.cs b/src/Microsoft.TestPlatform.CoreUtilities/GlobalSuppressions.cs +index 6b8e9ab2b..6ef4b19cd 100644 +--- a/src/Microsoft.TestPlatform.CoreUtilities/GlobalSuppressions.cs ++++ b/src/Microsoft.TestPlatform.CoreUtilities/GlobalSuppressions.cs +@@ -1,4 +1,7 @@ +-// This file is used by Code Analysis to maintain SuppressMessage ++// Copyright (c) Microsoft Corporation. All rights reserved. ++// Licensed under the MIT license. See LICENSE file in the project root for full license information. ++ ++// This file is used by Code Analysis to maintain SuppressMessage + // attributes that are applied to this project. + // Project-level suppressions either have no target or are given + // a specific target and scoped to a namespace, type, member, etc. From 4631996a61ccec5653b824f91545c316520bf7d3 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 3 May 2024 15:09:46 +0000 Subject: [PATCH 5/6] Add backport comment --- .../patches/vstest/0001-Add-missing-copyright-header.patch | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SourceBuild/patches/vstest/0001-Add-missing-copyright-header.patch b/src/SourceBuild/patches/vstest/0001-Add-missing-copyright-header.patch index faa6a2b10b6a..b9ab329e7f10 100644 --- a/src/SourceBuild/patches/vstest/0001-Add-missing-copyright-header.patch +++ b/src/SourceBuild/patches/vstest/0001-Add-missing-copyright-header.patch @@ -3,6 +3,7 @@ From: Michael Simons Date: Fri, 3 May 2024 14:47:13 +0000 Subject: [PATCH] Add missing copyright header +Backport: https://github.com/microsoft/vstest/pull/5020 --- .../GlobalSuppressions.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) From 9f8c2a7cd678e1ef6f595c8702a393070c4cf865 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 3 May 2024 16:35:12 +0000 Subject: [PATCH 6/6] Remove backported vstest patch --- .../0001-Add-missing-copyright-header.patch | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 src/SourceBuild/patches/vstest/0001-Add-missing-copyright-header.patch diff --git a/src/SourceBuild/patches/vstest/0001-Add-missing-copyright-header.patch b/src/SourceBuild/patches/vstest/0001-Add-missing-copyright-header.patch deleted file mode 100644 index b9ab329e7f10..000000000000 --- a/src/SourceBuild/patches/vstest/0001-Add-missing-copyright-header.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Fri, 3 May 2024 14:47:13 +0000 -Subject: [PATCH] Add missing copyright header - -Backport: https://github.com/microsoft/vstest/pull/5020 ---- - .../GlobalSuppressions.cs | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/Microsoft.TestPlatform.CoreUtilities/GlobalSuppressions.cs b/src/Microsoft.TestPlatform.CoreUtilities/GlobalSuppressions.cs -index 6b8e9ab2b..6ef4b19cd 100644 ---- a/src/Microsoft.TestPlatform.CoreUtilities/GlobalSuppressions.cs -+++ b/src/Microsoft.TestPlatform.CoreUtilities/GlobalSuppressions.cs -@@ -1,4 +1,7 @@ --// This file is used by Code Analysis to maintain SuppressMessage -+// Copyright (c) Microsoft Corporation. All rights reserved. -+// Licensed under the MIT license. See LICENSE file in the project root for full license information. -+ -+// This file is used by Code Analysis to maintain SuppressMessage - // attributes that are applied to this project. - // Project-level suppressions either have no target or are given - // a specific target and scoped to a namespace, type, member, etc.