From 81d9a28ec21f29a04df7313db238b099d0a71a54 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 15 May 2023 13:27:18 +0000 Subject: [PATCH 01/13] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230515.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23262.1 -> To Version 8.0.0-alpha.1.23265.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 73eeb8184..7e664db6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - d76c30028584fb1d02d9b27dc48e65ad87f4ecfe + 1c9c928d035c3e374d058987f08d0d2108021d2a From 3b73e692d1242cfa4952a53e804b0fb401e18c09 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 15 May 2023 14:28:49 +0000 Subject: [PATCH 02/13] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230515.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23262.1 -> To Version 8.0.0-alpha.1.23265.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e664db6f..c31fa89e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 1c9c928d035c3e374d058987f08d0d2108021d2a + b2881be920f36c1821c585674f18d330574ff044 From 3040a55e0f4fede07ff8f3fa5ebd5ff81a6b328e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 15 May 2023 14:29:03 +0000 Subject: [PATCH 03/13] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230515.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23265.2 -> To Version 8.0.0-alpha.1.23265.3 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c31fa89e9..ea1cede14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - b2881be920f36c1821c585674f18d330574ff044 + e2e64d25662c00a35726d3c52f969a50edaa4f48 From 7eea2f60fdcf419d65872c6173f2bdcd8381905a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Mon, 15 May 2023 08:50:25 -0700 Subject: [PATCH 04/13] Bump xunit/Newtonsoft.Json libs in SB SmokeTests (#16401) --- .../BasicScenarioTests.cs | 4 ++-- .../Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs | 2 +- .../Microsoft.DotNet.SourceBuild.SmokeTests.csproj | 9 ++++++--- .../SourceBuiltArtifactsTests.cs | 2 +- .../WebScenarioTests.cs | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs index af435cfdc..c2ac94910 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs @@ -23,9 +23,9 @@ public class BasicScenarioTests : SmokeTests [MemberData(nameof(GetScenarioObjects))] public void VerifyScenario(TestScenario scenario) => scenario.Execute(DotNetHelper); - private static IEnumerable GetScenarioObjects() => GetScenarios().Select(scenario => new object[] { scenario }); + public static IEnumerable GetScenarioObjects() => GetScenarios().Select(scenario => new object[] { scenario }); - private static IEnumerable GetScenarios() + public static IEnumerable GetScenarios() { foreach (DotNetLanguage language in Enum.GetValues()) { diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs index ec2d40ca5..b59ede5e4 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs @@ -32,7 +32,7 @@ internal static class Config public static string? PrereqsPath { get; } = Environment.GetEnvironmentVariable(PrereqsPathEnv); public static string? CustomPackagesPath { get; } = Environment.GetEnvironmentVariable(CustomPackagesPathEnv); public static string? SdkTarballPath { get; } = Environment.GetEnvironmentVariable(SdkTarballPathEnv); - public static string? SourceBuiltArtifactsPath { get; } = Environment.GetEnvironmentVariable(SourceBuiltArtifactsPathEnv) ?? + public static string SourceBuiltArtifactsPath { get; } = Environment.GetEnvironmentVariable(SourceBuiltArtifactsPathEnv) ?? throw new InvalidOperationException($"'{Config.SourceBuiltArtifactsPathEnv}' must be specified"); public static string TargetRid { get; } = Environment.GetEnvironmentVariable(TargetRidEnv) ?? throw new InvalidOperationException($"'{Config.TargetRidEnv}' must be specified"); diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj index ffeedb3f0..d13dabf93 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj @@ -9,12 +9,15 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all + + + diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs index 19b9ca1ca..49c03008f 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs @@ -48,7 +48,7 @@ public class SourceBuiltArtifactsTests : SmokeTests string sdkVersion = versionLines[1]; // Find the expected SDK version by getting it from the SDK tarball - ExtractFileFromTarball(Config.SdkTarballPath, "./sdk/*/.version", outputDir); + ExtractFileFromTarball(Config.SdkTarballPath ?? string.Empty, "./sdk/*/.version", outputDir); DirectoryInfo sdkDir = new DirectoryInfo(Path.Combine(outputDir, "sdk")); string sdkVersionPath = sdkDir.GetFiles(".version", SearchOption.AllDirectories).Single().FullName; string[] sdkVersionLines = File.ReadAllLines(Path.Combine(outputDir, sdkVersionPath)); diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs index 56d0368f3..b621705b9 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs @@ -22,7 +22,7 @@ public class WebScenarioTests : SmokeTests [MemberData(nameof(GetScenarioObjects))] public void VerifyScenario(TestScenario scenario) => scenario.Execute(DotNetHelper); - private static IEnumerable GetScenarioObjects() => GetScenarios().Select(scenario => new object[] { scenario }); + public static IEnumerable GetScenarioObjects() => GetScenarios().Select(scenario => new object[] { scenario }); private static IEnumerable GetScenarios() { From ccbb546194121f235a773b0c8ff1860e8f7c9891 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 May 2023 12:35:39 +0000 Subject: [PATCH 05/13] Update dependencies from https://github.com/dotnet/arcade build 20230515.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23262.5 -> To Version 8.0.0-beta.23265.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23261.1 -> To Version 1.0.0-beta.23263.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea1cede14..509e805b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - 1aff4eb33aa7cbf26ccd9fc43c17cb609a14dad4 + 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 - + https://github.com/dotnet/arcade - 1aff4eb33aa7cbf26ccd9fc43c17cb609a14dad4 + 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 - + https://github.com/dotnet/arcade - 1aff4eb33aa7cbf26ccd9fc43c17cb609a14dad4 + 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 https://github.com/dotnet/arcade-services @@ -228,9 +228,9 @@ 47c52dd2ebf9edfd40abdcff999c13eb461f6ce2 - + https://github.com/dotnet/xliff-tasks - a0391b3beff0696561189b5881f8af3b651d64ac + 3f7d6c7e742012d9437fcb0d04cac63202d37621 diff --git a/eng/Versions.props b/eng/Versions.props index 5bb550a69..71e152bb7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 8.0.0-beta.23262.5 + 8.0.0-beta.23265.1 diff --git a/global.json b/global.json index d01981ebb..50c5ec5f2 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23262.5", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23262.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23265.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23265.1" } } From 40e23c965aca3d56e197736aea2e8e2393fdf76b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 May 2023 13:00:53 +0000 Subject: [PATCH 06/13] Update dependencies from https://github.com/dotnet/source-build-externals build 20230515.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23262.1 -> To Version 8.0.0-alpha.1.23265.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea1cede14..608d3658e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -181,9 +181,9 @@ 9e870996b8bf0b91a791edd1039bfd23bdd01af8 - + https://github.com/dotnet/source-build-externals - a1460948fd0a4ab66b885c1575b085af70139e9a + 7100a017296d5d0ba6bdb9c163c246579e75aa6a From 7f9279f79593ef6d29a1f82ea79890591433e941 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 May 2023 15:17:20 +0000 Subject: [PATCH 07/13] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230516.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23265.3 -> To Version 8.0.0-alpha.1.23266.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea1cede14..22dc11d66 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - e2e64d25662c00a35726d3c52f969a50edaa4f48 + f2455b468728c02c7f7be14bf8cdf213be1a0b77 From 23c9cec3fbdbafe7324cfa451d20a9fc61b2ef15 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 May 2023 17:12:07 +0000 Subject: [PATCH 08/13] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230516.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23265.3 -> To Version 8.0.0-alpha.1.23266.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22dc11d66..167b3db33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - f2455b468728c02c7f7be14bf8cdf213be1a0b77 + a74fb65cdadc946a9d493af8a8390ce831acd96f From 6ce5d9354875c4c10d9a2fd39a24c0980dfd3730 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 16 May 2023 13:12:09 -0700 Subject: [PATCH 09/13] .NET Source-Build 8.0.100-preview.4.23260.5 May 2023 Updates (#16414) Co-authored-by: Matt Thalman --- 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 45c4c13ce..b8e6200fa 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -18,8 +18,8 @@ These URLs can't be composed from their base URL and version as we read them from the prep.sh and pipeline scripts, outside of MSBuild. --> - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.3.23178.7.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.4.23260.1.centos.8-x64.tar.gz https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-28.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.3.23210.1-centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.4.23260.1-centos.8-x64.tar.gz diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index a64d86975..1a12303a1 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-preview.3.23178.7" + "dotnet": "8.0.100-preview.4.23260.5" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From a10080d1d2e44958d227ad891ba3f5d1a5428851 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 May 2023 21:30:32 +0000 Subject: [PATCH 10/13] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230516.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23265.3 -> To Version 8.0.0-alpha.1.23266.3 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 167b3db33..09ece7eef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - a74fb65cdadc946a9d493af8a8390ce831acd96f + 2021f81bc0c36327bdd27fd4f7b4c2d8a9d91bbe From 12e9c80b53f1bdb32d79d333ee705beb5d721d8d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 May 2023 22:35:20 +0000 Subject: [PATCH 11/13] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230516.4 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23265.3 -> To Version 8.0.0-alpha.1.23266.4 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 09ece7eef..b6e1481fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 2021f81bc0c36327bdd27fd4f7b4c2d8a9d91bbe + fd98754b692a1a8da2aaadd28ce3952578d9d9ad From 9fffed5d080a29ca9bfdcdda3b29fd6796b571fd Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 17 May 2023 07:57:15 -0500 Subject: [PATCH 12/13] Remove MicrosoftNetCompilersToolsetPackageVersion patches (#16417) --- ...etCompilersToolsetVersion-instead-of.patch | 52 ------------------- ...CompilersToolsetVersion-instead-of-M.patch | 40 -------------- 2 files changed, 92 deletions(-) delete mode 100644 src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch delete mode 100644 src/SourceBuild/patches/sdk/0002-Use-MicrosoftNetCompilersToolsetVersion-instead-of-M.patch diff --git a/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch b/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch deleted file mode 100644 index a96b23f38..000000000 --- a/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Fri, 21 Apr 2023 03:07:28 +0000 -Subject: [PATCH] Use MicrosoftNetCompilersToolsetVersion instead of - MicrosoftNetCompilersToolsetPackageVersion - -Temporary fix for https://github.com/dotnet/source-build/issues/3392 ---- - Directory.Packages.props | 16 ++++++++-------- - eng/Versions.props | 4 ++-- - 2 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index c9041493..83f3d877 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -13,14 +13,14 @@ - - - -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ - - - -diff --git a/eng/Versions.props b/eng/Versions.props -index 2d325ec6..e1bc7022 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -35,7 +35,7 @@ - - 6.6.0-preview.3.61 - -- 4.7.0-1.23226.15 -+ 4.7.0-1.23226.15 - - 1.1.2-beta1.22216.1 - diff --git a/src/SourceBuild/patches/sdk/0002-Use-MicrosoftNetCompilersToolsetVersion-instead-of-M.patch b/src/SourceBuild/patches/sdk/0002-Use-MicrosoftNetCompilersToolsetVersion-instead-of-M.patch deleted file mode 100644 index d4869c8a8..000000000 --- a/src/SourceBuild/patches/sdk/0002-Use-MicrosoftNetCompilersToolsetVersion-instead-of-M.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Mon, 17 Apr 2023 20:19:53 +0000 -Subject: [PATCH] Use MicrosoftNetCompilersToolsetVersion instead of - MicrosoftNetCompilersToolsetPackageVersion - -Temporary fix for https://github.com/dotnet/source-build/issues/3392 ---- - src/Layout/redist/redist.csproj | 4 ++-- - src/Layout/redist/targets/GenerateLayout.targets | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/Layout/redist/redist.csproj b/src/Layout/redist/redist.csproj -index ada9291ad2..032389051f 100644 ---- a/src/Layout/redist/redist.csproj -+++ b/src/Layout/redist/redist.csproj -@@ -33,8 +33,8 @@ - - - -- -- -+ -+ - - - -diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets -index 3d3d3a47d3..03e06be78d 100644 ---- a/src/Layout/redist/targets/GenerateLayout.targets -+++ b/src/Layout/redist/targets/GenerateLayout.targets -@@ -27,7 +27,7 @@ - $(OutputPath)/Roslyn - - -- -+ - - - From 4a6b3d568b10c7f9c70a9088932e7a672f2336fd Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 17 May 2023 10:54:26 -0500 Subject: [PATCH 13/13] Remove obsolete aspnetcore source-build patch (#16424) --- ...ckage-validation-during-source-build.patch | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 src/SourceBuild/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch diff --git a/src/SourceBuild/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch b/src/SourceBuild/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch deleted file mode 100644 index 148bdb954..000000000 --- a/src/SourceBuild/patches/aspnetcore/0001-Disable-package-validation-during-source-build.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Mon, 5 Dec 2022 23:35:39 +0000 -Subject: [PATCH] Disable package validation during source-build - ---- - eng/SourceBuild.props | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index 63ebed2d9c..a1f0263955 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -56,6 +56,7 @@ - - $(InnerBuildArgs) /p:SourceBuildRuntimeIdentifier=$(TargetRuntimeIdentifier) - $(InnerBuildArgs) /p:CrossgenOutput=false -+ $(InnerBuildArgs) /p:EnablePackageValidation=false - - - --- -2.30.2.windows.1 \ No newline at end of file