Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch to Microsoft.DotNet.XUnitExtensions #6638

Merged
merged 1 commit into from
Jul 15, 2021
Merged

Switch to Microsoft.DotNet.XUnitExtensions #6638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions eng/Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<PackageReference Update="Microsoft.Build.NuGetSdkResolver" Version="$(NuGetBuildTasksVersion)" />
<PackageReference Update="Microsoft.CodeAnalysis.Build.Tasks" Version="$(MicrosoftNetCompilersToolsetVersion)" />
<PackageReference Update="Microsoft.DotNet.GenAPI" Version="2.1.0-prerelease-02404-02" />
<PackageReference Update="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
<PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="$(MicrosoftNetCompilersToolsetVersion)" />
<PackageReference Update="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.15" />
<PackageReference Update="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.16.30" />
Expand Down
4 changes: 4 additions & 0 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,9 @@
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>acc39bc99b84648f84d8775519a858a63dd739be</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21329.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha />
</Dependency>
</ToolsetDependencies>
</Dependencies>
1 change: 1 addition & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<!-- DotNetCliVersion MUST match the dotnet version in global.json.
Otherwise, this version of dotnet will not be installed and the build will error out. -->
<DotNetCliVersion>$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1))</DotNetCliVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21329.2</MicrosoftDotNetXUnitExtensionsVersion>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this be auto-updated by darc?

Also, is there some way we can specify the version once and have it appear both here and in Version.Details.xml?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this be auto-updated by darc?

Yes, I expect this to be updated by our existing arcade->msbuild darc subscription.

Also, is there some way we can specify the version once and have it appear both here and in Version.Details.xml?

I am not aware of one. Darc's design requires having it in two places updated by tooling.

<MicrosoftExtensionsDependencyModelVersion>6.0.0-preview.2.21154.6</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNetCompilersToolsetVersion>4.0.0-2.21320.2</MicrosoftNetCompilersToolsetVersion>
<NuGetBuildTasksVersion>6.0.0-preview.1.107</NuGetBuildTasksVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/Build.UnitTests/BackEnd/BuildManager_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3954,7 +3954,7 @@ public void OutOfProcEvaluationIdsUnique()
/// Regression test for https://github.com/Microsoft/msbuild/issues/3047
/// </summary>
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "out-of-proc nodes not working on mono yet")]
[SkipOnMono("out-of-proc nodes not working on mono yet")]
public void MultiProcReentrantProjectWithCallTargetDoesNotFail()
{
var a =
Expand Down
2 changes: 1 addition & 1 deletion src/Build.UnitTests/BackEnd/BuildRequest_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public void TestTranslation()

#if FEATURE_COM_INTEROP
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "disable com tests on mono")]
[SkipOnMono("disable com tests on mono")]
public void TestTranslationRemoteHostObjects()
{
var stateInHostObject = 3;
Expand Down
2 changes: 1 addition & 1 deletion src/Build.UnitTests/ConsoleLogger_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ public void ErrorMessageWithMultiplePropertiesInMessage(bool includeEvaluationPr

[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Netcoreapp, "Minimal path validation in Core allows expanding path containing quoted slashes.")]
[SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "Minimal path validation in Mono allows expanding path containing quoted slashes.")]
[SkipOnMono("Minimal path validation in Mono allows expanding path containing quoted slashes.")]
public void TestItemsWithUnexpandableMetadata()
{
SimulatedConsole sc = new SimulatedConsole();
Expand Down
8 changes: 4 additions & 4 deletions src/Build.UnitTests/Instance/HostServices_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ public void TestContradictoryAffinityCausesException_Any()
/// Test which ensures that setting an Any affinity for a project with a remote host object does not throws.
/// </summary>
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "disable com tests on mono")]
[SkipOnMono("disable com tests on mono")]
public void TestNoContradictoryRemoteHostObjectAffinity()
{
HostServices hostServices = new HostServices();
Expand Down Expand Up @@ -301,7 +301,7 @@ public void TestNonContraditcoryHostObjectAllowed_Any()
/// Test which ensures the remote host object cannot affect a project which has the Any affinity specifically set.
/// </summary>
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "disable com tests on mono")]
[SkipOnMono("disable com tests on mono")]
public void TestRegisterRemoteHostObjectNoAffect_Any2()
{
HostServices hostServices = new HostServices();
Expand Down Expand Up @@ -341,7 +341,7 @@ public void TestNonContraditcoryHostObjectAllowed_InProc()
/// Test which ensures the affinity for a project can be changed once the in process host object is registered
/// </summary>
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "disable com tests on mono")]
[SkipOnMono("disable com tests on mono")]
public void TestAffinityChangeAfterRegisterInprocessHostObject()
{
HostServices hostServices = new HostServices();
Expand Down Expand Up @@ -452,7 +452,7 @@ public void UnloadedProjectDiscardsHostServices()
/// Tests that register overrides existing reigsted remote host object.
/// </summary>
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "disable com tests on mono")]
[SkipOnMono("disable com tests on mono")]
public void TestRegisterOverrideExistingRegisted()
{
var hostServices = new HostServices();
Expand Down
2 changes: 2 additions & 0 deletions src/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@
<PackageReference Include="xunit.core" />
<PackageReference Include="xunit.assert" />

<PackageReference Include="Microsoft.DotNet.XUnitExtensions" />

<!-- Don't localize unit test projects -->
<PackageReference Remove="XliffTasks" />

Expand Down
4 changes: 2 additions & 2 deletions src/Tasks.UnitTests/ResourceHandling/GenerateResource_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2716,7 +2716,7 @@ public References(ITestOutputHelper output)

[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Netcoreapp, "Linked resources not supported on Core: https://github.com/microsoft/msbuild/issues/4094")]
[SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "https://github.com/Microsoft/msbuild/issues/677")]
[SkipOnMono("https://github.com/Microsoft/msbuild/issues/677")]
public void DontLockP2PReferenceWhenResolvingSystemTypes()
{
// This WriteLine is a hack. On a slow machine, the Tasks unittest fails because remoting
Expand Down Expand Up @@ -2894,7 +2894,7 @@ public class Class1
/// </summary>
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Netcoreapp, "Linked resources not supported on Core: https://github.com/microsoft/msbuild/issues/4094")]
[SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "https://github.com/Microsoft/msbuild/issues/677")]
[SkipOnMono("https://github.com/Microsoft/msbuild/issues/677")]
public void ReferencedAssemblySpecifiedUsingRelativePath()
{
// This WriteLine is a hack. On a slow machine, the Tasks unittest fails because remoting
Expand Down
24 changes: 0 additions & 24 deletions src/Xunit.NetCore.Extensions/Attributes/ActiveIssueAttribute.cs
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions src/Xunit.NetCore.Extensions/Attributes/ConditionalFactAttribute.cs
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions src/Xunit.NetCore.Extensions/Attributes/ConditionalTheoryAttribute.cs
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions src/Xunit.NetCore.Extensions/Attributes/OuterLoopAttribute.cs
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions src/Xunit.NetCore.Extensions/Attributes/PlatformSpecificAttribute.cs
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions src/Xunit.NetCore.Extensions/Attributes/SkipOnTargetFrameworkAttribute.cs
View file
Open in desktop

This file was deleted.

71 changes: 0 additions & 71 deletions src/Xunit.NetCore.Extensions/Discoverers/ActiveIssueDiscoverer.cs
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions src/Xunit.NetCore.Extensions/Discoverers/ConditionalFactDiscoverer.cs
View file
Open in desktop

This file was deleted.

Loading