mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source
This commit is contained in:
v-wuzhai 2024-07-04 15:05:30 +08:00 committed by GitHub
commit 3ba314d58f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 37 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
.github/workflows/inter-branch-merge-flow.yml vendored Normal file
View file

@ -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'

2
.vsts-ci.yml
View file

@ -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:

6
.vsts-pr.yml
View file

@ -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

4
eng/build-pr.yml
View file

@ -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 }}'

4
eng/build.yml
View file

@ -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 }}'

2
src/SourceBuild/content/eng/pipelines/templates/jobs/sdk-diff-tests.yml
View file

@ -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

1
src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkAssemblyVersions.diff
View file

@ -1 +0,0 @@

1
test/Directory.Build.props
View file

@ -3,5 +3,6 @@
<Import Project="..\eng\TestVersions.props" />
<PropertyGroup>
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
<UseVSTestRunner>true</UseVSTestRunner>
</PropertyGroup>
</Project>

2
test/EndToEnd/ValidateInsertedManifests.cs
View file

@ -36,7 +36,7 @@ namespace EndToEnd.Tests
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");
}
}
}

6
test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/CommandResultAssertions.cs
View file

@ -28,14 +28,14 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
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 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
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);
}

16
test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/DirectoryInfoAssertions.cs
View file

@ -26,7 +26,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
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 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
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 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
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,8 +132,8 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
{
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);
}
@ -141,7 +141,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
{
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 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
{
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));
}

2
test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
View file

@ -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" />

2
test/core-sdk-tasks.Tests/core-sdk-tasks.Tests.csproj
View file

@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="4.18.0" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
</ItemGroup>
<ItemGroup>