diff --git a/NuGet.config b/NuGet.config index 28f47068e..9fcb5685f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,6 +22,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31e0c32e8..36b5c4916 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -140,7 +140,7 @@ https://github.com/microsoft/vstest 11b375cec01792f2f37e3aaf199c0dc71aaa8786 - + https://github.com/dotnet/runtime @@ -191,20 +191,29 @@ 2c8079e2e8e78c0cd11ac75a32014756136ecdb9 + + https://github.com/dotnet/command-line-api + 8374d5fca634a93458c84414b1604c12f765d1ab + + + https://github.com/dotnet/command-line-api + 8374d5fca634a93458c84414b1604c12f765d1ab + + - + https://github.com/dotnet/arcade - a178d756de78f9fd55339cb92665e791a3ba6535 + 1205248d5cc014b68c2fb8cfbf091a77aa433453 - + https://github.com/dotnet/arcade - a178d756de78f9fd55339cb92665e791a3ba6535 + 1205248d5cc014b68c2fb8cfbf091a77aa433453 - + https://github.com/dotnet/arcade - a178d756de78f9fd55339cb92665e791a3ba6535 + 1205248d5cc014b68c2fb8cfbf091a77aa433453 https://github.com/dotnet/arcade-services @@ -218,9 +227,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 9eb08132867fce9671597e3ca6f89a345547ee4f + b0f656e394f8e98f48f11612ac997750bb85ff6c diff --git a/eng/Versions.props b/eng/Versions.props index 7cd6afda1..11cce5c6c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ - 8.0.0-beta.23307.2 + 8.0.0-beta.23308.2 diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 106c1e730..881796396 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -230,14 +230,8 @@ jobs: dockerVolumeArgs="-v $(sourcesPath):/vmr" dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=${{ parameters.excludeOmniSharpTests }} -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true -e SMOKE_TESTS_RUNNING_IN_CI=true" - poisonArg='' - if [[ '${{ parameters.enablePoison }}' == 'True' ]]; then - poisonArg='--poison' - dockerEnvArgs+=" -e SMOKE_TESTS_WARN_POISON_DIFFS=true" - fi - - docker run --rm $dockerVolumeArgs -w /vmr $dockerEnvArgs ${{ parameters.container }} ./build.sh $poisonArg --run-smoke-test $(additionalBuildArgs) -- -p:SmokeTestConsoleVerbosity=detailed + docker run --rm $dockerVolumeArgs -w /vmr $dockerEnvArgs ${{ parameters.container }} ./build.sh --run-smoke-test $(additionalBuildArgs) -- -p:SmokeTestConsoleVerbosity=detailed displayName: Run Tests # Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph. diff --git a/global.json b/global.json index 4eca81913..c24c61426 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.23307.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23307.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23308.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23308.2" } } diff --git a/src/SourceBuild/content/build.proj b/src/SourceBuild/content/build.proj index 50c1b64f6..5c017d848 100644 --- a/src/SourceBuild/content/build.proj +++ b/src/SourceBuild/content/build.proj @@ -70,7 +70,8 @@ HashCatalogFilePath="$(PoisonReportDataFile)" MarkerFileName="$(PoisonMarkerFile)" PoisonReportOutputFilePath="$(PoisonUsageReportFile)" - NonShippingPackagesListFiles="@(NonShippingPackagesList)" /> + NonShippingPackagesListFiles="@(NonShippingPackagesList)" + FailOnPoisonFound="true" /> @@ -93,7 +94,6 @@ - SMOKE_TESTS_POISON_REPORT_PATH=$(PoisonUsageReportFile); %(SdkTarballItem.Identity) %(SourceBuiltArtifactsItem.Identity) normal diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs index 27ff93efb..e983090be 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs @@ -160,11 +160,6 @@ namespace Microsoft.DotNet.SourceBuild.Tasks.LeakDetection { Log.LogWarning($"{poisons.Count()} marked files leaked to output. See complete report '{PoisonReportOutputFilePath}' for details."); } - else - { - Log.LogError($"No leaked files found in output. Either something is broken or it is the future and we have fixed all leaks - please verify and remove this error if so (and default {nameof(FailOnPoisonFound)} to true)."); - return false; - } return !Log.HasLoggedErrors; } diff --git a/src/SourceBuild/content/repo-projects/dotnet.proj b/src/SourceBuild/content/repo-projects/dotnet.proj index f3b4b1807..00c76e8f2 100644 --- a/src/SourceBuild/content/repo-projects/dotnet.proj +++ b/src/SourceBuild/content/repo-projects/dotnet.proj @@ -20,7 +20,6 @@ - @@ -31,6 +30,7 @@ + diff --git a/src/SourceBuild/content/repo-projects/razor.proj b/src/SourceBuild/content/repo-projects/razor.proj index 3cc65f052..7e1f9a25e 100644 --- a/src/SourceBuild/content/repo-projects/razor.proj +++ b/src/SourceBuild/content/repo-projects/razor.proj @@ -12,6 +12,8 @@ + + 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 b59ede5e4..9a9a39360 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs @@ -12,21 +12,18 @@ internal static class Config public const string DotNetDirectoryEnv = "SMOKE_TESTS_DOTNET_DIR"; public const string ExcludeOmniSharpEnv = "SMOKE_TESTS_EXCLUDE_OMNISHARP"; public const string MsftSdkTarballPathEnv = "SMOKE_TESTS_MSFT_SDK_TARBALL_PATH"; - public const string PoisonReportPathEnv = "SMOKE_TESTS_POISON_REPORT_PATH"; public const string PortableRidEnv = "SMOKE_TESTS_PORTABLE_RID"; public const string PrereqsPathEnv = "SMOKE_TESTS_PREREQS_PATH"; public const string CustomPackagesPathEnv = "SMOKE_TESTS_CUSTOM_PACKAGES_PATH"; public const string SdkTarballPathEnv = "SMOKE_TESTS_SDK_TARBALL_PATH"; public const string SourceBuiltArtifactsPathEnv = "SMOKE_TESTS_SOURCEBUILT_ARTIFACTS_PATH"; public const string TargetRidEnv = "SMOKE_TESTS_TARGET_RID"; - public const string WarnPoisonDiffsEnv = "SMOKE_TESTS_WARN_POISON_DIFFS"; public const string WarnSdkContentDiffsEnv = "SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS"; public const string RunningInCIEnv = "SMOKE_TESTS_RUNNING_IN_CI"; public static string DotNetDirectory { get; } = Environment.GetEnvironmentVariable(DotNetDirectoryEnv) ?? Path.Combine(Directory.GetCurrentDirectory(), ".dotnet"); public static string? MsftSdkTarballPath { get; } = Environment.GetEnvironmentVariable(MsftSdkTarballPathEnv); - public static string? PoisonReportPath { get; } = Environment.GetEnvironmentVariable(PoisonReportPathEnv); public static string PortableRid { get; } = Environment.GetEnvironmentVariable(PortableRidEnv) ?? throw new InvalidOperationException($"'{Config.PortableRidEnv}' must be specified"); public static string? PrereqsPath { get; } = Environment.GetEnvironmentVariable(PrereqsPathEnv); @@ -37,8 +34,6 @@ internal static class Config public static string TargetRid { get; } = Environment.GetEnvironmentVariable(TargetRidEnv) ?? throw new InvalidOperationException($"'{Config.TargetRidEnv}' must be specified"); public static string TargetArchitecture { get; } = TargetRid.Split('-')[1]; - public static bool WarnOnPoisonDiffs { get; } = - bool.TryParse(Environment.GetEnvironmentVariable(WarnPoisonDiffsEnv), out bool excludeOnlineTests) && excludeOnlineTests; public static bool WarnOnSdkContentDiffs { get; } = bool.TryParse(Environment.GetEnvironmentVariable(WarnSdkContentDiffsEnv), out bool excludeOnlineTests) && excludeOnlineTests; diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs deleted file mode 100644 index f600d558d..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs +++ /dev/null @@ -1,35 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System; -using System.IO; -using System.Text.RegularExpressions; -using Xunit.Abstractions; - -namespace Microsoft.DotNet.SourceBuild.SmokeTests -{ - public class PoisonTests : SmokeTests - { - public PoisonTests(ITestOutputHelper outputHelper) : base(outputHelper) { } - - [SkippableFact(Config.PoisonReportPathEnv, skipOnNullOrWhiteSpace: true)] - public void VerifyUsage() - { - if (!File.Exists(Config.PoisonReportPath)) - { - throw new InvalidOperationException($"Poison report '{Config.PoisonReportPath}' does not exist."); - } - - string currentPoisonReport = File.ReadAllText(Config.PoisonReportPath); - currentPoisonReport = RemoveHashes(currentPoisonReport); - currentPoisonReport = BaselineHelper.RemoveRids(currentPoisonReport); - currentPoisonReport = BaselineHelper.RemoveRids(currentPoisonReport, true); - currentPoisonReport = BaselineHelper.RemoveVersions(currentPoisonReport); - - BaselineHelper.CompareContents("PoisonUsage.txt", currentPoisonReport, OutputHelper, Config.WarnOnPoisonDiffs); - } - - private static string RemoveHashes(string source) => Regex.Replace(source, "^\\s*.*(\r\n?|\n)", string.Empty, RegexOptions.Multiline); - } -} diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt deleted file mode 100644 index 21692e830..000000000 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt +++ /dev/null @@ -1,8 +0,0 @@ - - - AssemblyAttribute - - - AssemblyAttribute - - \ No newline at end of file diff --git a/src/SourceBuild/patches/razor/0001-Add-System.Collections.Immutable-package-dependency.patch b/src/SourceBuild/patches/razor/0001-Add-System.Collections.Immutable-package-dependency.patch new file mode 100644 index 000000000..50fb3f8d6 --- /dev/null +++ b/src/SourceBuild/patches/razor/0001-Add-System.Collections.Immutable-package-dependency.patch @@ -0,0 +1,34 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nikola Milosavljevic +Date: Thu, 8 Jun 2023 18:39:26 +0000 +Subject: [PATCH] Add System.Collections.Immutable package dependency + +Backport: https://github.com/dotnet/razor/pull/8817 +--- + eng/Version.Details.xml | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml +index 3d75f97f3..c52b0a554 100644 +--- a/eng/Version.Details.xml ++++ b/eng/Version.Details.xml +@@ -105,12 +105,16 @@ + 9e7fbcab4e5275f63c0cd37553ba426de9194309 + + +- ++ + + https://github.com/dotnet/aspnetcore + ae1a6cbe225b99c0bf38b7e31bf60cb653b73a52 + ++ ++ https://github.com/dotnet/runtime ++ 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 ++ + +