Merge branch 'main' into dev/Jason/Update-the-sdk-target-to-net10.0

dotnet · Nov 2, 2024 · 27a0734 · 27a0734
2 parents 18659d8 + 467d7ba
commit 27a0734
Show file tree

Hide file tree

Showing 14 changed files with 296 additions and 329 deletions.
diff --git 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.24530.2",
+      "version": "1.1.0-beta.24367.3",
       "commands": [
         "darc"
       ]

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
diff --git a/eng/Versions.props b/eng/Versions.props
diff --git a/global.json b/global.json
@@ -17,8 +17,8 @@
     "cmake": "latest"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24530.1",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24530.1",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24531.2",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24531.2",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
   }

diff --git a/src/SourceBuild/content/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/src/SourceBuild/content/eng/pipelines/templates/jobs/sdk-diff-tests.yml
@@ -130,7 +130,6 @@ jobs:
       /p:MsftSdkTarballPath=$(MsftSdkTarballPath)
       /p:SdkTarballPath=$(SdkTarballPath)
       /p:SourceBuiltArtifactsPath=$(SourceBuiltArtifactsPath)
-      /p:SourceBuildTestsWarnOnSdkContentDiffs=false
       /p:TargetRid=${{ parameters.targetRid }}
       /p:PortableRid=$(Platform)-${{ parameters.architecture }}
     displayName: Run Tests

diff --git a/src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml b/src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml
@@ -133,7 +133,6 @@ extends:
             -flp:LogFile=$(Build.SourcesDirectory)/artifacts/logs/BuildTests_$(date +"%m%d%H%M%S").log
             -clp:v=m
             /p:SourceBuildTestsLicenseScanPath=$(repoPath)
-            /p:SourceBuildTestsWarnOnLicenseScanDiffs=false
             /p:TargetRid=linux-x64
             /p:PortableRid=linux-x64
             /p:SkipPrepareSdkArchive=true

diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/BaselineHelper.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/BaselineHelper.cs
@@ -45,15 +45,15 @@ public static void CompareEntries(string baselineFileName, IOrderedEnumerable<st
             Assert.Null(message);
         }
 
-        public static void CompareBaselineContents(string baselineFileName, string actualContents, ITestOutputHelper outputHelper, bool warnOnDiffs = false, string baselineSubDir = "")
+        public static void CompareBaselineContents(string baselineFileName, string actualContents, ITestOutputHelper outputHelper, string baselineSubDir = "")
         {
             string actualFilePath = Path.Combine(Config.LogsDirectory, $"Updated{baselineFileName}");
             File.WriteAllText(actualFilePath, actualContents);
 
-            CompareFiles(GetBaselineFilePath(baselineFileName, baselineSubDir), actualFilePath, outputHelper, warnOnDiffs);
+            CompareFiles(GetBaselineFilePath(baselineFileName, baselineSubDir), actualFilePath, outputHelper);
         }
 
-        public static void CompareFiles(string expectedFilePath, string actualFilePath, ITestOutputHelper outputHelper, bool warnOnDiffs = false)
+        public static void CompareFiles(string expectedFilePath, string actualFilePath, ITestOutputHelper outputHelper)
         {
             string baselineFileText = File.ReadAllText(expectedFilePath).Trim();
             string actualFileText = File.ReadAllText(actualFilePath).Trim();
@@ -64,21 +64,11 @@ public static void CompareFiles(string expectedFilePath, string actualFilePath,
             {
                 // Retrieve a diff in order to provide a UX which calls out the diffs.
                 string diff = DiffFiles(expectedFilePath, actualFilePath, outputHelper);
-                string prefix = warnOnDiffs ? "##vso[task.logissue type=warning;]" : string.Empty;
-                message = $"{Environment.NewLine}{prefix}Expected file '{expectedFilePath}' does not match actual file '{actualFilePath}`.  {Environment.NewLine}"
+                message = $"{Environment.NewLine}Expected file '{expectedFilePath}' does not match actual file '{actualFilePath}`.  {Environment.NewLine}"
                     + $"{diff}{Environment.NewLine}";
-
-                if (warnOnDiffs)
-                {
-                    outputHelper.WriteLine(message);
-                    outputHelper.WriteLine("##vso[task.complete result=SucceededWithIssues;]");
-                }
             }
 
-            if (!warnOnDiffs)
-            {
-                Assert.Null(message);
-            }
+            Assert.Null(message);
         }
 
         public static string DiffFiles(string file1Path, string file2Path, ITestOutputHelper outputHelper)

diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/Config.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/Config.cs
@@ -27,8 +27,6 @@ internal static class Config
     public static string? PrereqsPath => (string)AppContext.GetData(ConfigSwitchPrefix + nameof(PrereqsPath))!;
     public static string? SdkTarballPath => (string)AppContext.GetData(ConfigSwitchPrefix + nameof(SdkTarballPath))!;
     public static string? SourceBuiltArtifactsPath => (string)AppContext.GetData(ConfigSwitchPrefix + nameof(SourceBuiltArtifactsPath))!;
-    public static bool WarnOnLicenseScanDiffs => bool.TryParse((string)AppContext.GetData(ConfigSwitchPrefix + nameof(WarnOnLicenseScanDiffs))!, out bool warnOnLicenseScanDiffs) && warnOnLicenseScanDiffs;
-    public static bool WarnOnSdkContentDiffs => bool.TryParse((string)AppContext.GetData(ConfigSwitchPrefix + nameof(WarnOnSdkContentDiffs))!, out bool warnOnSdkContentDiffs) && warnOnSdkContentDiffs;
 
     // Indicates whether the tests are being run in the context of a CI pipeline
     public static bool RunningInCI => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("DOTNET_CI")) ||

diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/DotNetHelper.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/DotNetHelper.cs
@@ -31,16 +31,6 @@ public DotNetHelper(ITestOutputHelper outputHelper)
 
         lock (s_lockObj)
         {
-            if (!Directory.Exists(Config.DotNetDirectory))
-            {
-                if (!File.Exists(Config.SdkTarballPath))
-                {
-                    throw new InvalidOperationException($"Tarball path '{Config.SdkTarballPath}' specified in {Config.SdkTarballPath} does not exist.");
-                }
-
-                Directory.CreateDirectory(Config.DotNetDirectory);
-                Utilities.ExtractTarball(Config.SdkTarballPath, Config.DotNetDirectory, outputHelper);
-            }
             IsMonoRuntime = DetermineIsMonoRuntime(Config.DotNetDirectory);
 
             if (!Directory.Exists(ProjectsDirectory))

diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/LicenseScanTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/LicenseScanTests.cs
@@ -177,7 +177,7 @@ public void ScanForLicenses()
         string actualFilePath = Path.Combine(Config.LogsDirectory, $"Updated{baselineName}");
         File.WriteAllText(actualFilePath, json);
 
-        BaselineHelper.CompareFiles(expectedFilePath, actualFilePath, OutputHelper, Config.WarnOnLicenseScanDiffs);
+        BaselineHelper.CompareFiles(expectedFilePath, actualFilePath, OutputHelper);
     }
 
     private void FilterFiles(ScancodeResults scancodeResults)

diff --git a/...content/test/Microsoft.DotNet.SourceBuild.Tests/Microsoft.DotNet.SourceBuild.Tests.csproj b/...content/test/Microsoft.DotNet.SourceBuild.Tests/Microsoft.DotNet.SourceBuild.Tests.csproj
@@ -52,7 +52,7 @@
         <Value>$(ArtifactsTestResultsDir)</Value>
       </RuntimeHostConfigurationOption>
       <RuntimeHostConfigurationOption Include="$(MSBuildProjectName).DotNetDirectory">
-        <Value>$(TargetDir)extracted-sdk</Value>
+        <Value>$(DotNetSdkExtractDir)</Value>
       </RuntimeHostConfigurationOption>
       <RuntimeHostConfigurationOption Include="$(MSBuildProjectName).TargetRid">
         <Value>$(TargetRid)</Value>
@@ -87,12 +87,6 @@
       <RuntimeHostConfigurationOption Include="$(MSBuildProjectName).SourceBuiltArtifactsPath">
         <Value>$(SourceBuiltArtifactsPath)</Value>
       </RuntimeHostConfigurationOption>
-      <RuntimeHostConfigurationOption Include="$(MSBuildProjectName).WarnOnLicenseScanDiffs">
-        <Value>$(SourceBuildTestsWarnOnLicenseScanDiffs)</Value>
-      </RuntimeHostConfigurationOption>
-      <RuntimeHostConfigurationOption Include="$(MSBuildProjectName).WarnOnSdkContentDiffs">
-        <Value>$(SourceBuildTestsWarnOnSdkContentDiffs)</Value>
-      </RuntimeHostConfigurationOption>
     </ItemGroup>
   </Target>
 

diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/README.md b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/README.md
@@ -16,8 +16,6 @@ Optional msbuild properties:
 - SourceBuildTestsExcludeOmniSharpTests
 - SourceBuildTestsLicenseScanPath
 - SourceBuildTestsPrereqsPath
-- SourceBuildTestsWarnOnLicenseScanDiffs
-- SourceBuildTestsWarnOnSdkContentDiffs
 
 Make sure to rebuild the test project when changing one of those values.
 

diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/SdkContentTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/SdkContentTests.cs
@@ -48,7 +48,7 @@ public void CompareMsftToSbFileList()
 
         string diff = BaselineHelper.DiffFiles(msftFileListingFileName, sbFileListingFileName, OutputHelper);
         diff = RemoveDiffMarkers(diff);
-        BaselineHelper.CompareBaselineContents("MsftToSbSdkFiles.diff", diff, OutputHelper, Config.WarnOnSdkContentDiffs, BaselineSubDir);
+        BaselineHelper.CompareBaselineContents("MsftToSbSdkFiles.diff", diff, OutputHelper, BaselineSubDir);
     }
 
     [ConditionalFact(typeof(SdkContentTests), nameof(IncludeSdkContentTests))]
@@ -79,7 +79,7 @@ public void CompareMsftToSbAssemblyVersions()
 
             string diff = BaselineHelper.DiffFiles(MsftVersionsFileName, SbVersionsFileName, OutputHelper);
             diff = RemoveDiffMarkers(diff);
-            BaselineHelper.CompareBaselineContents("MsftToSbSdkAssemblyVersions.diff", diff, OutputHelper, Config.WarnOnSdkContentDiffs, BaselineSubDir);
+            BaselineHelper.CompareBaselineContents("MsftToSbSdkAssemblyVersions.diff", diff, OutputHelper, BaselineSubDir);
         }
         finally
         {

diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/SourceBuiltArtifactsTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/SourceBuiltArtifactsTests.cs
@@ -17,7 +17,7 @@ namespace Microsoft.DotNet.SourceBuild.Tests;
 public class SourceBuiltArtifactsTests : SdkTests
 {
     public static bool IncludeSourceBuiltArtifactsTests => !string.IsNullOrWhiteSpace(Config.SourceBuiltArtifactsPath);
-    
+
     public SourceBuiltArtifactsTests(ITestOutputHelper outputHelper) : base(outputHelper) { }
 
     [ConditionalFact(typeof(SourceBuiltArtifactsTests), nameof(IncludeSourceBuiltArtifactsTests))]
@@ -55,9 +55,8 @@ public void VerifyVersionFile()
 
             string sdkVersion = versionLines[1];
 
-            // Find the expected SDK version by getting it from the SDK tarball
-            Utilities.ExtractTarball(Config.SdkTarballPath ?? string.Empty, outputDir, "./sdk/*/.version");
-            DirectoryInfo sdkDir = new DirectoryInfo(Path.Combine(outputDir, "sdk"));
+            // Find the expected SDK version by getting it from the source built SDK
+            DirectoryInfo sdkDir = new DirectoryInfo(Path.Combine(Config.DotNetDirectory, "sdk"));
             string sdkVersionPath = sdkDir.GetFiles(".version", SearchOption.AllDirectories).Single().FullName;
             string[] sdkVersionLines = File.ReadAllLines(Path.Combine(outputDir, sdkVersionPath));
             string expectedSdkVersion = sdkVersionLines[3];  // Get the unique, non-stable, SDK version