diff --git a/.github/workflows/inter-branch-merge-flow.yml b/.github/workflows/inter-branch-merge-flow.yml new file mode 100644 index 000000000000..89e1a6530479 --- /dev/null +++ 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' \ No newline at end of file diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 449b5db47126..a391e5f434aa 100644 --- 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 index 0629bdeef653..a625f954d59b 100644 --- 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 index 6804dd7be399..7110071b086f 100644 --- 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 index 54192a470515..a26103e5e39a 100644 --- 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/test/Directory.Build.props b/test/Directory.Build.props index 26d486322e94..8369b6680a26 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -3,5 +3,6 @@ true + true diff --git a/test/EndToEnd/ValidateInsertedManifests.cs b/test/EndToEnd/ValidateInsertedManifests.cs index 778c07ea7321..64e3a3b5d9f3 100644 --- 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 index 7301d9a814a9..2c883c4186d7 100644 --- 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 ExitWith(int expectedExitCode) public AndConstraint 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(this); } public AndConstraint 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(this); } @@ -125,7 +125,7 @@ public AndConstraint HaveStdErrMatching(string pattern, public AndConstraint 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(this); } diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/DirectoryInfoAssertions.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/DirectoryInfoAssertions.cs index adb83caf28c2..74b45b8dbc5e 100644 --- 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 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(this); } @@ -71,7 +71,7 @@ public AndConstraint 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(this); } @@ -109,8 +109,8 @@ public AndConstraint 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(this); } @@ -132,8 +132,8 @@ public AndConstraint 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(this); } @@ -141,7 +141,7 @@ public AndConstraint 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(new DirectoryInfoAssertions(dir)); } @@ -160,7 +160,7 @@ public AndConstraint 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(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 index 27da1cfb8f57..485ec5fad717 100644 --- 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 @@ - + diff --git a/test/core-sdk-tasks.Tests/core-sdk-tasks.Tests.csproj b/test/core-sdk-tasks.Tests/core-sdk-tasks.Tests.csproj index 47b6ce51724b..0e751c8abc19 100644 --- 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 @@ - +