Skip to content

Commit 43bd5b1

Browse files
namratabnamratab
committed
Update Authorization dll version and fix tests
1 parent 2c3020e commit 43bd5b1

File tree

20 files changed

+1397
-2065
lines changed

20 files changed

+1397
-2065
lines changed

‎src/ResourceManager/Batch/Commands.Batch.Test/Commands.Batch.Test.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,14 @@
5555
<HintPath>..\..\..\packages\Microsoft.Azure.Gallery.2.6.0-preview\lib\net40\Microsoft.Azure.Gallery.dll</HintPath>
5656
</Reference>
5757
<Reference Include="Microsoft.Azure.Management.Authorization">
58-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.16.0-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
58+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.17.0-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
5959
</Reference>
6060
<Reference Include="Microsoft.Azure.Management.Batch">
6161
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Batch.1.3.0-preview\lib\net40\Microsoft.Azure.Management.Batch.dll</HintPath>
6262
</Reference>
63-
<Reference Include="Microsoft.Azure.ResourceManager">
64-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.12.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
63+
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64+
<SpecificVersion>False</SpecificVersion>
65+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.13.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
6566
</Reference>
6667
<Reference Include="Microsoft.Azure.Test.Framework, Version=1.0.5486.28526, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6768
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Extensions" version="0.13.0-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Gallery" version="2.6.0-preview" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Management.Authorization" version="0.16.0-preview" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Management.Authorization" version="0.17.0-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Batch" version="1.3.0-preview" targetFramework="net45" />
10-
<package id="Microsoft.Azure.Management.Resources" version="2.12.0-preview" targetFramework="net45" />
10+
<package id="Microsoft.Azure.Management.Resources" version="2.13.0-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Test.Framework" version="1.0.5486.28526-prerelease" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5486.28526-prerelease" targetFramework="net45" />
1313
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,16 @@
5757
<Reference Include="Microsoft.Azure.Gallery">
5858
<HintPath>..\..\..\packages\Microsoft.Azure.Gallery.2.6.0-preview\lib\net40\Microsoft.Azure.Gallery.dll</HintPath>
5959
</Reference>
60-
<Reference Include="Microsoft.Azure.Management.Authorization">
61-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.16.0-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
60+
<Reference Include="Microsoft.Azure.Management.Authorization, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
61+
<SpecificVersion>False</SpecificVersion>
62+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.17.0-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6263
</Reference>
6364
<Reference Include="Microsoft.Azure.Management.DataFactories">
6465
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.0.15.0-preview\lib\net40\Microsoft.Azure.Management.DataFactories.dll</HintPath>
6566
</Reference>
66-
<Reference Include="Microsoft.Azure.ResourceManager">
67-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.12.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
67+
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68+
<SpecificVersion>False</SpecificVersion>
69+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.13.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
6870
</Reference>
6971
<Reference Include="Microsoft.Azure.Test.Framework, Version=1.0.5486.28526, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7072
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Extensions" version="0.13.0-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Gallery" version="2.6.0-preview" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Management.Authorization" version="0.16.0-preview" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Management.Authorization" version="0.17.0-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.DataFactories" version="0.15.0-preview" targetFramework="net45" />
10-
<package id="Microsoft.Azure.Management.Resources" version="2.12.0-preview" targetFramework="net45" />
10+
<package id="Microsoft.Azure.Management.Resources" version="2.13.0-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Test.Framework" version="1.0.5486.28526-prerelease" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5486.28526-prerelease" targetFramework="net45" />
1313
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

‎src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,11 @@
6464
<HintPath>..\..\..\packages\Microsoft.Azure.Graph.RBAC.1.6.0-preview\lib\net40\Microsoft.Azure.Graph.RBAC.dll</HintPath>
6565
</Reference>
6666
<Reference Include="Microsoft.Azure.Management.Authorization">
67-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.16.0-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
67+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.17.0-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6868
</Reference>
69-
<Reference Include="Microsoft.Azure.ResourceManager">
70-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.12.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
69+
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70+
<SpecificVersion>False</SpecificVersion>
71+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.13.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
7172
</Reference>
7273
<Reference Include="Microsoft.Azure.Test.Framework">
7374
<HintPath>..\..\..\packages\Microsoft.Azure.Test.Framework.1.0.5486.28526-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>

‎src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/RoleAssignmentTests.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
using Microsoft.Azure.Test;
2525
using System;
2626
using System.Linq;
27+
using System.Threading;
2728
using Xunit;
2829

2930
namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
@@ -78,7 +79,7 @@ public void RaUserPermissions()
7879
{
7980
User newUser = null;
8081
ResourceGroup resourceGroup = null;
81-
string roleAssignmentId = "6A26D717-ABA9-44E3-B971-C53694E413B2";
82+
string roleAssignmentId = "9B8D3FBE-4A95-406C-AAE6-50528FA2AEFB";
8283
string userName = null;
8384
string userPass = null;
8485
string userPermission = "*/read";
@@ -116,6 +117,9 @@ public void RaUserPermissions()
116117
.ResourceGroups
117118
.First();
118119

120+
// Wait to allow newly created object changes to propagate
121+
Thread.Sleep(TimeSpan.FromSeconds(20));
122+
119123
return new[]
120124
{
121125
string.Format(

0 commit comments

Comments
 (0)