[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx' (#19964)

v-wuzhai · web-flow · commit 3ba314d58fa6 · 2024-07-04T15:05:30.000+08:00
diff --git a/.github/workflows/inter-branch-merge-flow.yml b/.github/workflows/inter-branch-merge-flow.yml
@@ -0,0 +1,15 @@
+name: Inter-branch merge workflow
+on:
+  push:
+    branches:
+      - release/**
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  Merge:
+    uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
+    with: 
+      configuration_file_branch: 'release/8.0.4xx'
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -103,7 +103,6 @@ extends:
             buildArchitecture: x64
             additionalBuildParameters: '/p:PublishInternalAsset=true'
             runTests: true
-
         # Linux
         - template: eng/build.yml@self
           parameters:
@@ -207,7 +206,6 @@ extends:
             buildConfiguration: Release
             buildArchitecture: arm64
             runTests: false
-
         # Linux
         - template: eng/build.yml@self
           parameters:
diff --git a/.vsts-pr.yml b/.vsts-pr.yml
@@ -55,10 +55,8 @@ stages:
   
   ## PR-only jobs
   
-  - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
-    
+  - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: 
     ## Windows
-
     - template: eng/build-pr.yml
       parameters:
         agentOs: Windows_NT
@@ -138,8 +136,8 @@ stages:
         linuxPortable: true
         runTests: true
 
-    # MacOS
 
+    # MacOS
     - template: eng/build-pr.yml
       parameters:
         agentOs: Darwin
diff --git a/eng/build-pr.yml b/eng/build-pr.yml
@@ -234,8 +234,8 @@ jobs:
     - task: PublishTestResults@2
       displayName: Publish Test Results
       inputs:
-        testRunner: XUnit
-        testResultsFiles: 'artifacts/TestResults/${{ parameters.buildConfiguration }}/*.xml'
+        testRunner: VSTest
+        testResultsFiles: 'artifacts/TestResults/${{ parameters.buildConfiguration }}/*.trx'
         testRunTitle: '$(_AgentOSName)_$(Agent.JobName)'
         platform: '$(BuildPlatform)'
         configuration: '${{ parameters.buildConfiguration }}'
diff --git a/eng/build.yml b/eng/build.yml
@@ -240,8 +240,8 @@ jobs:
     - task: PublishTestResults@2
       displayName: Publish Test Results
       inputs:
-        testRunner: XUnit
-        testResultsFiles: 'artifacts/TestResults/${{ parameters.buildConfiguration }}/*.xml'
+        testRunner: VSTest
+        testResultsFiles: 'artifacts/TestResults/${{ parameters.buildConfiguration }}/*.trx'
         testRunTitle: '$(_AgentOSName)_$(Agent.JobName)'
         platform: '$(BuildPlatform)'
         configuration: '${{ parameters.buildConfiguration }}'
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
@@ -47,7 +47,7 @@ jobs:
 
       echo "Installer build: https://dev.azure.com/dnceng/internal/_build/results?buildId=$installer_build&view=results"
 
-      echo "##vso[build.addbuildtag]installer-$installer_sha"
+      echo "##vso[build.addbuildtag]installer $installer_sha"
       echo "##vso[task.setvariable variable=InstallerBuildId]$installer_build"
       echo "##vso[task.setvariable variable=DotnetDotnetBuildId]$dotnet_dotnet_build"
     displayName: Find associated builds
diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkAssemblyVersions.diff b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkAssemblyVersions.diff
@@ -1 +0,0 @@
-
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -3,5 +3,6 @@
   <Import Project="..\eng\TestVersions.props" />
   <PropertyGroup>
     <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
+    <UseVSTestRunner>true</UseVSTestRunner>
   </PropertyGroup>
 </Project>
diff --git a/test/EndToEnd/ValidateInsertedManifests.cs b/test/EndToEnd/ValidateInsertedManifests.cs
@@ -36,7 +36,7 @@ public void ManifestReaderCanReadManifests()
                         new FileInfo(manifestFile).Exists.Should().BeTrue();
                         using var fileStream = new FileStream(manifestFile, FileMode.Open, FileAccess.Read);
                         Action readManifest = () => WorkloadManifestReader.ReadWorkloadManifest(manifestId, fileStream, manifestFile);
-                        readManifest.ShouldNotThrow("manifestId:" + manifestId + " manifestFile:" + manifestFile + "is invalid");
+                        readManifest.Should().NotThrow("manifestId:" + manifestId + " manifestFile:" + manifestFile + "is invalid");
                     }
                 }
             }
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/CommandResultAssertions.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/CommandResultAssertions.cs
@@ -28,14 +28,14 @@ public AndConstraint<CommandResultAssertions> ExitWith(int expectedExitCode)
         public AndConstraint<CommandResultAssertions> Pass()
         {
             Execute.Assertion.ForCondition(_commandResult.ExitCode == 0)
-                .FailWith(AppendDiagnosticsTo($"Expected command to pass but it did not."));
+                .FailWith(AppendDiagnosticsTo("Expected command to pass but it did not."));
             return new AndConstraint<CommandResultAssertions>(this);
         }
 
         public AndConstraint<CommandResultAssertions> Fail()
         {
             Execute.Assertion.ForCondition(_commandResult.ExitCode != 0)
-                .FailWith(AppendDiagnosticsTo($"Expected command to fail but it did not."));
+                .FailWith(AppendDiagnosticsTo("Expected command to fail but it did not."));
             return new AndConstraint<CommandResultAssertions>(this);
         }
 
@@ -125,7 +125,7 @@ public AndConstraint<CommandResultAssertions> HaveStdErrMatching(string pattern,
         public AndConstraint<CommandResultAssertions> NotHaveStdOut()
         {
             Execute.Assertion.ForCondition(string.IsNullOrEmpty(_commandResult.StdOut))
-                .FailWith(AppendDiagnosticsTo($"Expected command to not output to stdout but it was not:"));
+                .FailWith(AppendDiagnosticsTo("Expected command to not output to stdout but it was not:"));
             return new AndConstraint<CommandResultAssertions>(this);
         }
 
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/DirectoryInfoAssertions.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/DirectoryInfoAssertions.cs
@@ -26,7 +26,7 @@ public DirectoryInfoAssertions(DirectoryInfo dir)
         public AndConstraint<DirectoryInfoAssertions> Exist()
         {
             Execute.Assertion.ForCondition(_dirInfo.Exists)
-                .FailWith("Expected directory {0} does not exist.", _dirInfo.FullName);
+                .FailWith(String.Format("Expected directory {0} does not exist.", _dirInfo.FullName));
             return new AndConstraint<DirectoryInfoAssertions>(this);
         }
 
@@ -71,7 +71,7 @@ public AndConstraint<DirectoryInfoAssertions> NotHaveFile(
             Execute.Assertion
                 .ForCondition(file == null)
                 .BecauseOf(because, reasonArgs)
-                .FailWith("File {0} should not be found in directory {1}.", expectedFile, _dirInfo.FullName);
+                .FailWith(String.Format("File {0} should not be found in directory {1}.", expectedFile, _dirInfo.FullName));
             return new AndConstraint<DirectoryInfoAssertions>(this);
         }
 
@@ -109,8 +109,8 @@ public AndConstraint<DirectoryInfoAssertions> HaveFilesMatching(
             Execute.Assertion
                 .ForCondition(matchingFileExists == true)
                 .BecauseOf(because, reasonArgs)
-                .FailWith("Expected directory {0} to contain files matching {1}, but no matching file exists.",
-                    _dirInfo.FullName, expectedFilesSearchPattern);
+                .FailWith(String.Format("Expected directory {0} to contain files matching {1}, but no matching file exists.",
+                    _dirInfo.FullName, expectedFilesSearchPattern));
 
             return new AndConstraint<DirectoryInfoAssertions>(this);
         }
@@ -132,16 +132,16 @@ public AndConstraint<DirectoryInfoAssertions> NotHaveFilesMatching(string expect
         {
             var matchingFileCount = _dirInfo.EnumerateFiles(expectedFilesSearchPattern, searchOption).Count();
             Execute.Assertion.ForCondition(matchingFileCount == 0)
-                .FailWith("Found {0} files that should not exist in directory {1}. No file matching {2} should exist.",
-                    matchingFileCount, _dirInfo.FullName, expectedFilesSearchPattern);
+                .FailWith(String.Format("Found {0} files that should not exist in directory {1}. No file matching {2} should exist.",
+                    matchingFileCount, _dirInfo.FullName, expectedFilesSearchPattern));
             return new AndConstraint<DirectoryInfoAssertions>(this);
         }
 
         public AndConstraint<DirectoryInfoAssertions> HaveDirectory(string expectedDir)
         {
             var dir = _dirInfo.EnumerateDirectories(expectedDir, SearchOption.TopDirectoryOnly).SingleOrDefault();
             Execute.Assertion.ForCondition(dir != null)
-                .FailWith("Expected directory {0} cannot be found inside directory {1}.", expectedDir, _dirInfo.FullName);
+                .FailWith(String.Format("Expected directory {0} cannot be found inside directory {1}.", expectedDir, _dirInfo.FullName));
 
             return new AndConstraint<DirectoryInfoAssertions>(new DirectoryInfoAssertions(dir));
         }
@@ -160,7 +160,7 @@ public AndConstraint<DirectoryInfoAssertions> NotHaveDirectory(string unexpected
         {
             var dir = _dirInfo.EnumerateDirectories(unexpectedDir, SearchOption.TopDirectoryOnly).SingleOrDefault();
             Execute.Assertion.ForCondition(dir == null)
-                .FailWith("Directory {0} should not be found in directory {1}.", unexpectedDir, _dirInfo.FullName);
+                .FailWith(String.Format("Directory {0} should not be found in directory {1}.", unexpectedDir, _dirInfo.FullName));
 
             return new AndConstraint<DirectoryInfoAssertions>(new DirectoryInfoAssertions(dir));
         }
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
@@ -4,7 +4,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="4.18.0" />
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="Microsoft.DotNet.Cli.Utils" Version="$(MicrosoftDotNetCliUtilsPackageVersion)" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
diff --git a/test/core-sdk-tasks.Tests/core-sdk-tasks.Tests.csproj b/test/core-sdk-tasks.Tests/core-sdk-tasks.Tests.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="4.18.0" />
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
   </ItemGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public void ManifestReaderCanReadManifests()`
`36`	`36`	`new FileInfo(manifestFile).Exists.Should().BeTrue();`
`37`	`37`	`using var fileStream = new FileStream(manifestFile, FileMode.Open, FileAccess.Read);`
`38`	`38`	`Action readManifest = () => WorkloadManifestReader.ReadWorkloadManifest(manifestId, fileStream, manifestFile);`
`39`		`- readManifest.ShouldNotThrow("manifestId:" + manifestId + " manifestFile:" + manifestFile + "is invalid");`
	`39`	`+ readManifest.Should().NotThrow("manifestId:" + manifestId + " manifestFile:" + manifestFile + "is invalid");`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,14 +28,14 @@ public AndConstraint<CommandResultAssertions> ExitWith(int expectedExitCode)`
`28`	`28`	`public AndConstraint<CommandResultAssertions> Pass()`
`29`	`29`	`{`
`30`	`30`	`Execute.Assertion.ForCondition(_commandResult.ExitCode == 0)`
`31`		`- .FailWith(AppendDiagnosticsTo($"Expected command to pass but it did not."));`
	`31`	`+ .FailWith(AppendDiagnosticsTo("Expected command to pass but it did not."));`
`32`	`32`	`return new AndConstraint<CommandResultAssertions>(this);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public AndConstraint<CommandResultAssertions> Fail()`
`36`	`36`	`{`
`37`	`37`	`Execute.Assertion.ForCondition(_commandResult.ExitCode != 0)`
`38`		`- .FailWith(AppendDiagnosticsTo($"Expected command to fail but it did not."));`
	`38`	`+ .FailWith(AppendDiagnosticsTo("Expected command to fail but it did not."));`
`39`	`39`	`return new AndConstraint<CommandResultAssertions>(this);`
`40`	`40`	`}`
`41`	`41`
`@@ -125,7 +125,7 @@ public AndConstraint<CommandResultAssertions> HaveStdErrMatching(string pattern,`
`125`	`125`	`public AndConstraint<CommandResultAssertions> NotHaveStdOut()`
`126`	`126`	`{`
`127`	`127`	`Execute.Assertion.ForCondition(string.IsNullOrEmpty(_commandResult.StdOut))`
`128`		`- .FailWith(AppendDiagnosticsTo($"Expected command to not output to stdout but it was not:"));`
	`128`	`+ .FailWith(AppendDiagnosticsTo("Expected command to not output to stdout but it was not:"));`
`129`	`129`	`return new AndConstraint<CommandResultAssertions>(this);`
`130`	`130`	`}`
`131`	`131`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public DirectoryInfoAssertions(DirectoryInfo dir)`
`26`	`26`	`public AndConstraint<DirectoryInfoAssertions> Exist()`
`27`	`27`	`{`
`28`	`28`	`Execute.Assertion.ForCondition(_dirInfo.Exists)`
`29`		`- .FailWith("Expected directory {0} does not exist.", _dirInfo.FullName);`
	`29`	`+ .FailWith(String.Format("Expected directory {0} does not exist.", _dirInfo.FullName));`
`30`	`30`	`return new AndConstraint<DirectoryInfoAssertions>(this);`
`31`	`31`	`}`
`32`	`32`
`@@ -71,7 +71,7 @@ public AndConstraint<DirectoryInfoAssertions> NotHaveFile(`
`71`	`71`	`Execute.Assertion`
`72`	`72`	`.ForCondition(file == null)`
`73`	`73`	`.BecauseOf(because, reasonArgs)`
`74`		`- .FailWith("File {0} should not be found in directory {1}.", expectedFile, _dirInfo.FullName);`
	`74`	`+ .FailWith(String.Format("File {0} should not be found in directory {1}.", expectedFile, _dirInfo.FullName));`
`75`	`75`	`return new AndConstraint<DirectoryInfoAssertions>(this);`
`76`	`76`	`}`
`77`	`77`
`@@ -109,8 +109,8 @@ public AndConstraint<DirectoryInfoAssertions> HaveFilesMatching(`
`109`	`109`	`Execute.Assertion`
`110`	`110`	`.ForCondition(matchingFileExists == true)`
`111`	`111`	`.BecauseOf(because, reasonArgs)`
`112`		`- .FailWith("Expected directory {0} to contain files matching {1}, but no matching file exists.",`
`113`		`- _dirInfo.FullName, expectedFilesSearchPattern);`
	`112`	`+ .FailWith(String.Format("Expected directory {0} to contain files matching {1}, but no matching file exists.",`
	`113`	`+ _dirInfo.FullName, expectedFilesSearchPattern));`
`114`	`114`
`115`	`115`	`return new AndConstraint<DirectoryInfoAssertions>(this);`
`116`	`116`	`}`
`@@ -132,16 +132,16 @@ public AndConstraint<DirectoryInfoAssertions> NotHaveFilesMatching(string expect`
`132`	`132`	`{`
`133`	`133`	`var matchingFileCount = _dirInfo.EnumerateFiles(expectedFilesSearchPattern, searchOption).Count();`
`134`	`134`	`Execute.Assertion.ForCondition(matchingFileCount == 0)`
`135`		`- .FailWith("Found {0} files that should not exist in directory {1}. No file matching {2} should exist.",`
`136`		`- matchingFileCount, _dirInfo.FullName, expectedFilesSearchPattern);`
	`135`	`+ .FailWith(String.Format("Found {0} files that should not exist in directory {1}. No file matching {2} should exist.",`
	`136`	`+ matchingFileCount, _dirInfo.FullName, expectedFilesSearchPattern));`
`137`	`137`	`return new AndConstraint<DirectoryInfoAssertions>(this);`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`public AndConstraint<DirectoryInfoAssertions> HaveDirectory(string expectedDir)`
`141`	`141`	`{`
`142`	`142`	`var dir = _dirInfo.EnumerateDirectories(expectedDir, SearchOption.TopDirectoryOnly).SingleOrDefault();`
`143`	`143`	`Execute.Assertion.ForCondition(dir != null)`
`144`		`- .FailWith("Expected directory {0} cannot be found inside directory {1}.", expectedDir, _dirInfo.FullName);`
	`144`	`+ .FailWith(String.Format("Expected directory {0} cannot be found inside directory {1}.", expectedDir, _dirInfo.FullName));`
`145`	`145`
`146`	`146`	`return new AndConstraint<DirectoryInfoAssertions>(new DirectoryInfoAssertions(dir));`
`147`	`147`	`}`
`@@ -160,7 +160,7 @@ public AndConstraint<DirectoryInfoAssertions> NotHaveDirectory(string unexpected`
`160`	`160`	`{`
`161`	`161`	`var dir = _dirInfo.EnumerateDirectories(unexpectedDir, SearchOption.TopDirectoryOnly).SingleOrDefault();`
`162`	`162`	`Execute.Assertion.ForCondition(dir == null)`
`163`		`- .FailWith("Directory {0} should not be found in directory {1}.", unexpectedDir, _dirInfo.FullName);`
	`163`	`+ .FailWith(String.Format("Directory {0} should not be found in directory {1}.", unexpectedDir, _dirInfo.FullName));`
`164`	`164`
`165`	`165`	`return new AndConstraint<DirectoryInfoAssertions>(new DirectoryInfoAssertions(dir));`
`166`	`166`	`}`