Skip to content

Commit 008b872

Browse files
markcowlmarkcowl
committed
Changes to support xunit revert to 1.9.2
1 parent 64195ec commit 008b872

File tree

35 files changed

+67
-91
lines changed

35 files changed

+67
-91
lines changed

‎AzurePowershell.Test.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</PropertyGroup>
4444

4545
<ItemGroup>
46-
<<XUnitTests Include=".\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll"/>
46+
<XUnitTests Include=".\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll"/>
4747
<XUnitTests Include=".\src\ResourceManager\SiteRecovery\Commands.SiteRecovery.Test\bin\Debug\Microsoft.Azure.Commands.SiteRecovery.Test.dll"/>
4848
<XUnitTests Include=".\src\Common\Commands.Common.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Common.Test.dll"/>
4949
<XUnitTests Include=".\src\ResourceManager\Sql\Commands.Sql.Test\bin\Debug\Microsoft.Azure.Commands.Sql.Test.dll"/>

‎src/Common/Commands.Common.Test/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
[assembly: Guid("080bc9b8-3c00-4d0e-bec2-38d2fd0d7061")]
2929
[assembly: AssemblyVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyVersion)]
3030
[assembly: AssemblyFileVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyFileVersion)]
31-
[assembly: CollectionBehavior(DisableTestParallelization = true)]
31+
3232
#if SIGN
3333
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
3434
#else

‎src/Common/Commands.ScenarioTest/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,3 @@
4343
// by using the '*' as shown below:
4444
[assembly: AssemblyVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyVersion)]
4545
[assembly: AssemblyFileVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyFileVersion)]
46-
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/Common/Commands.ScenarioTests.Common/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,3 @@
3434
// [assembly: AssemblyVersion("1.0.*")]
3535
[assembly: AssemblyVersion("1.0.0.0")]
3636
[assembly: AssemblyFileVersion("1.0.0.0")]
37-
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,3 @@
3535
// [assembly: AssemblyVersion("1.0.*")]
3636
[assembly: AssemblyVersion("1.0.0.0")]
3737
[assembly: AssemblyFileVersion("1.0.0.0")]
38-
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,3 @@
3535
// [assembly: AssemblyVersion("1.0.*")]
3636
[assembly: AssemblyVersion("1.0.0.0")]
3737
[assembly: AssemblyFileVersion("1.0.0.0")]
38-
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/ResourceManager/ApiManagement/Commands.SMAPI.Test/ScenarioTests/ApiManagementTests.cs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Test.Scenario
2727
using Microsoft.WindowsAzure.Management.Storage;
2828
using Xunit;
2929

30-
public class ApiManagementTests : IClassFixture<ApiManagementTestsFixture>
30+
public class ApiManagementTests : IUseFixture<ApiManagementTestsFixture>
3131
{
3232
private readonly EnvironmentSetupHelper _helper;
3333
private ApiManagementTestsFixture _fixture;
3434

35-
public ApiManagementTests(ApiManagementTestsFixture fixture)
35+
public ApiManagementTests()
3636
{
3737
_helper = new EnvironmentSetupHelper();
38-
_fixture = fixture;
3938
}
4039

40+
4141
protected void SetupManagementClients()
4242
{
4343
var apiManagementManagementClient = GetApiManagementManagementClient();
@@ -181,5 +181,10 @@ private void RunPowerShellTest(params string[] scripts)
181181
_helper.RunPowerShellTest(scripts);
182182
}
183183
}
184+
185+
public void SetFixture(ApiManagementTestsFixture data)
186+
{
187+
this._fixture = data;
188+
}
184189
}
185190
}

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,3 @@
4848
// [assembly: AssemblyVersion("1.0.*")]
4949
[assembly: AssemblyVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyVersion)]
5050
[assembly: AssemblyFileVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyFileVersion)]
51-
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,3 @@
3535
// [assembly: AssemblyVersion("1.0.*")]
3636
[assembly: AssemblyVersion("1.0.0.0")]
3737
[assembly: AssemblyFileVersion("1.0.0.0")]
38-
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/ResourceManager/Commerce/Commands.UsageAggregates.Test/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,3 @@
3434

3535
[assembly: AssemblyVersion("0.1.0")]
3636
[assembly: AssemblyFileVersion("0.1.0")]
37-
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/ResourceManager/Compute/Commands.Compute.Test/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,3 @@
3434

3535
[assembly: AssemblyVersion("0.8.5")]
3636
[assembly: AssemblyFileVersion("0.8.5")]
37-
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,3 @@
3434

3535
[assembly: AssemblyVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyVersion)]
3636
[assembly: AssemblyFileVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyFileVersion)]
37-
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/ResourceManager/Dns/Commands.Dns.Test/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,3 @@
3535

3636
[assembly: AssemblyVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyVersion)]
3737
[assembly: AssemblyFileVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyFileVersion)]
38-
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/ResourceManager/Insights/Commands.Insights.Test/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,3 @@
3434

3535
[assembly: AssemblyVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyVersion)]
3636
[assembly: AssemblyFileVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyFileVersion)]
37-
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,3 @@
4949
// [assembly: AssemblyVersion("1.0.*")]
5050
[assembly: AssemblyVersion( "1.0.0.0" )]
5151
[assembly: AssemblyFileVersion( "1.0.0.0" )]
52-
[assembly: CollectionBehavior(DisableTestParallelization = true)]

0 commit comments

Comments
 (0)